diff --git a/search-services/packaging/config.properties b/search-services/packaging/config.properties
index 9be18bdcb..24a6a3984 100644
--- a/search-services/packaging/config.properties
+++ b/search-services/packaging/config.properties
@@ -3,7 +3,7 @@ alfresco.search.ssl.need=needclientauth" default="true"
 alfresco.search.logs=SOLR_LOGS_DIR=../../logs\
 ${line.separator}LOG4J_PROPS=$SOLR_LOGS_DIR/log4j.properties
 alfresco.gc.logs=GC_LOG_OPTS=""
-alfresco.gc.logs.win=set "GC_LOG_OPTS= "
+alfresco.gc.logs.win=REM set "GC_LOG_OPTS= "
 alfresco.search.logs.win=set SOLR_LOGS_DIR=..\\..\\logs\
 ${line.separator}set LOG4J_CONFIG=file:!SOLR_LOGS_DIR!\\log4j.properties
 alfresco.search.config=# Alfresco configuration. This file is automatically included by solr. You can define your custom settings here\
diff --git a/search-services/packaging/src/docker/5.x/docker-compose.yml b/search-services/packaging/src/docker/5.x/docker-compose.yml
index 3a89f0ec7..e72d9c683 100644
--- a/search-services/packaging/src/docker/5.x/docker-compose.yml
+++ b/search-services/packaging/src/docker/5.x/docker-compose.yml
@@ -3,7 +3,13 @@ services:
   platform:
     image: docker-internal.alfresco.com/platform:${ALFRESCO_TAG}
     environment:
-      JAVA_TOOL_OPTIONS: "-Dsolr.host=search -Dsolr.port=8983 -Dsolr.secureComms=none -Dsolr.base.url=/solr -Dindex.subsystem.name=solr6"
+      JAVA_TOOL_OPTIONS: "
+        -Dsolr.host=search
+        -Dsolr.port=8983
+        -Dsolr.secureComms=none
+        -Dsolr.base.url=/solr
+        -Dindex.subsystem.name=solr6
+        "
     ports:
       - "7203:7203" #JMX connect via service:jmx:rmi:///jndi/rmi://localhost:7203/jmxrmi
       - "5005:5005" #Java debugging
@@ -21,5 +27,7 @@ services:
       SOLR_SOLR_PORT: 8983
       #Create the default alfresco and archive cores
       SOLR_CREATE_ALFRESCO_DEFAULTS: alfresco,archive
+      #HTTP by default
+      ALFRESCO_SECURE_COMMS: none
     ports:
       - "8083:8983" #Browser port for Solr
\ No newline at end of file