diff --git a/e2e-test/pom.xml b/e2e-test/pom.xml
index 434162586..a92a550e9 100644
--- a/e2e-test/pom.xml
+++ b/e2e-test/pom.xml
@@ -10,9 +10,9 @@
    <name>Search Analytics E2E Tests</name>
    <description>Test Project to test Search Service and Analytics Features on a complete setup of Alfresco, Share</description>
    <properties>
-      <tas.rest.api.version>1.70</tas.rest.api.version>
+      <tas.rest.api.version>1.73</tas.rest.api.version>
       <tas.cmis.api.version>1.31</tas.cmis.api.version>
-      <tas.utility.version>3.0.45</tas.utility.version>
+      <tas.utility.version>3.0.48</tas.utility.version>
       <rm.version>3.3.1</rm.version>
       <suiteXmlFile>src/test/resources/SearchSuite.xml</suiteXmlFile>
       <test.exclude />
diff --git a/e2e-test/python-generator/generator.py b/e2e-test/python-generator/generator.py
index 0db122e4c..d412cddae 100644
--- a/e2e-test/python-generator/generator.py
+++ b/e2e-test/python-generator/generator.py
@@ -129,7 +129,7 @@ def getSolrcoreReplacements(sharding, communication, fingerprint):
         solrcoreReplacements['alfresco.encryption.ssl.truststore.location=.*'] = 'alfresco.encryption.ssl.truststore.location=\\\\\\/opt\\\\\\/alfresco-search-services\\\\\\/keystore\\\\\\/ssl-repo-client.truststore'
         solrcoreReplacements['alfresco.encryption.ssl.truststore.type=.*'] = 'alfresco.encryption.ssl.truststore.type=JCEKS'
     elif communication == 'none':
-        solrcoreReplacements['alfresco.secureComms=https'] = 'alfresco.secureComms=none'
+        solrcoreReplacements['alfresco.secureComms=https'] = r'alfresco.secureComms=none\\\\\\\nalfresco.allowUnauthenticatedSolrEndpoint=true'
     else :
         solrcoreReplacements['alfresco.secureComms=https'] = 'alfresco.secureComms=secret'
     return solrcoreReplacements
@@ -331,6 +331,8 @@ if __name__ == '__main__':
     if args.communication == 'mtls':
         addAlfrescoMtlsConfig(dcYaml['services']['alfresco']['build']['args'])
         addAlfrescoVolumes(dcYaml['services']['alfresco'])
+    elif args.communication == 'none':
+        dcYaml['services']['alfresco']['build']['args']['SOLR_COMMS'] = 'none'
 
     if not args.share:
         deleteServices(dcYaml, 'share', 'alfresco-pdf-renderer', 'imagemagick')
diff --git a/e2e-test/python-generator/templates/alfresco/Dockerfile.template b/e2e-test/python-generator/templates/alfresco/Dockerfile.template
index 3438f963e..9ba789e6f 100755
--- a/e2e-test/python-generator/templates/alfresco/Dockerfile.template
+++ b/e2e-test/python-generator/templates/alfresco/Dockerfile.template
@@ -42,6 +42,12 @@ RUN if [ "$$SOLR_COMMS" == "https" ] ; then \
             truststoreFile=\"\/usr\/local\/tomcat\/alf_data\/keystore\/ssl.truststore\"\n\
             truststorePass=\"$${TRUSTSTORE_PASS}\" truststoreType=\"$${TRUSTSTORE_TYPE}\" clientAuth=\"want\" sslProtocol=\"TLS\">\n\
         <\/Connector>/g" $${TOMCAT_DIR}/conf/server.xml; \
+    elif [ "$$SOLR_COMMS" == "none" ] ; then \
+      sed -i "s/<filter-class>org.alfresco.web.app.servlet.AlfrescoX509ServletFilter<\/filter-class>/&\n\
+        <init-param>\n\
+           <param-name>allow-unauthenticated-solr-endpoint<\/param-name>\n\
+           <param-value>true<\/param-value>\n\
+        <\/init-param>/" $${TOMCAT_DIR}/webapps/alfresco/WEB-INF/web.xml; \
     fi
 
 # Expose keystore folder
diff --git a/e2e-test/src/test/resources/default.properties b/e2e-test/src/test/resources/default.properties
index 822a78906..cdea4f50e 100644
--- a/e2e-test/src/test/resources/default.properties
+++ b/e2e-test/src/test/resources/default.properties
@@ -19,6 +19,7 @@ rest.rmPath=alfresco/api/-default-/public/gs/versions/1
 solr.scheme=http
 solr.server=localhost
 solr.port=8083
+solr.secret=secret
 
 #Solr Indexing Time
 # Use 1s and 60 attempts, see AbstractE2EFunctionalTest.SEARCH_MAX_ATTEMPTS
diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/security/SecretSharedPropertyCollector.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/security/SecretSharedPropertyCollector.java
index d56aa9636..5e3517975 100644
--- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/security/SecretSharedPropertyCollector.java
+++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/security/SecretSharedPropertyCollector.java
@@ -73,7 +73,7 @@ public class SecretSharedPropertyCollector
         // Shared configuration (shared.properties file)
         PROPERTY_LOCATORS.add((name, defaultValue) -> toSet(AlfrescoSolrDataModel.getCommonConfig().getProperty(name)));
         // Configuration for each deployed SOLR Core
-        PROPERTY_LOCATORS.add((name, defaultValue) -> SecretSharedPropertyHelper.getPropertyFromCores(name, defaultValue));
+        PROPERTY_LOCATORS.add(SecretSharedPropertyHelper::getPropertyFromCores);
     }
 
     /**