diff --git a/dev/dev-acs-amps-overlay/pom.xml b/dev/dev-acs-amps-overlay/pom.xml
index 1e5a6bad6..e9d3ffdf8 100644
--- a/dev/dev-acs-amps-overlay/pom.xml
+++ b/dev/dev-acs-amps-overlay/pom.xml
@@ -69,7 +69,8 @@
                         <dir.root>${runtime.data.folder}/alf_data</dir.root>
                         <solr.host>localhost</solr.host>
                         <solr.base.url>/solr</solr.base.url>
-                        <solr.secureComms>none</solr.secureComms>
+                        <solr.secureComms>secret</solr.secureComms>
+                        <solr.sharedSecret>secret</solr.sharedSecret>
                         <encryption.keystore.type>pkcs12</encryption.keystore.type>
                         <encryption.cipherAlgorithm>AES/CBC/PKCS5Padding</encryption.cipherAlgorithm>
                         <encryption.keyAlgorithm>AES</encryption.keyAlgorithm>
diff --git a/dev/docker-compose.yml b/dev/docker-compose.yml
index 0c37203e4..6dc2e327c 100644
--- a/dev/docker-compose.yml
+++ b/dev/docker-compose.yml
@@ -25,20 +25,24 @@ services:
             - 5432:5432
 
     solr6:
-        image: alfresco/alfresco-search-services:2.0.0
+        image: alfresco/alfresco-search-services:2.0.3-RC2
         mem_limit: 2g
         environment:
             #Solr needs to know how to register itself with Alfresco
-            - SOLR_ALFRESCO_HOST=alfresco
-            - SOLR_ALFRESCO_PORT=8080
+            SOLR_ALFRESCO_HOST: "alfresco"
+            SOLR_ALFRESCO_PORT: "8080"
             #Alfresco needs to know how to call solr
-            - SOLR_SOLR_HOST=solr6
-            - SOLR_SOLR_PORT=8983
+            SOLR_SOLR_HOST: "solr6"
+            SOLR_SOLR_PORT: "8983"
             #Create the default alfresco and archive cores
-            - SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive
+            SOLR_CREATE_ALFRESCO_DEFAULTS: "alfresco,archive"
             #HTTP by default
-            - ALFRESCO_SECURE_COMMS=none
-            - "SOLR_JAVA_MEM=-Xms2g -Xmx2g"
+            ALFRESCO_SECURE_COMMS: "secret"
+            JAVA_TOOL_OPTIONS:
+              "
+              -Dalfresco.secureComms.secret=secret
+              "
+            SOLR_JAVA_MEM: "-Xms2g -Xmx2g"
         ports:
             - 8083:8983 #Browser port
 
diff --git a/tests/environment/.env b/tests/environment/.env
index 3f8d2a5f5..03318fd6a 100644
--- a/tests/environment/.env
+++ b/tests/environment/.env
@@ -1,4 +1,4 @@
 TRANSFORMERS_TAG=2.5.7-A6
-SOLR6_TAG=2.0.2
+SOLR6_TAG=2.0.3-RC2
 POSTGRES_TAG=13.3
-ACTIVEMQ_TAG=5.16.1
+ACTIVEMQ_TAG=5.16.1
\ No newline at end of file
diff --git a/tests/environment/docker-compose-minimal+transforms.yml b/tests/environment/docker-compose-minimal+transforms.yml
index 979452d03..eb8299014 100644
--- a/tests/environment/docker-compose-minimal+transforms.yml
+++ b/tests/environment/docker-compose-minimal+transforms.yml
@@ -28,7 +28,8 @@ services:
         -Ddb.url=jdbc:postgresql://postgres:5432/alfresco
         -Dsolr.host=solr6
         -Dsolr.port=8983
-        -Dsolr.secureComms=none
+        -Dsolr.secureComms=secret
+        -Dsolr.sharedSecret=secret
         -Dsolr.base.url=/solr
         -Dindex.subsystem.name=solr6
         -Dalfresco.restApi.basicAuthScheme=true
@@ -63,15 +64,19 @@ services:
     image: alfresco/alfresco-search-services:${SOLR6_TAG}
     environment:
       #Solr needs to know how to register itself with Alfresco
-      - SOLR_ALFRESCO_HOST=alfresco
-      - SOLR_ALFRESCO_PORT=8080
+      SOLR_ALFRESCO_HOST: "alfresco"
+      SOLR_ALFRESCO_PORT: "8080"
       #Alfresco needs to know how to call solr
-      - SOLR_SOLR_HOST=solr6
-      - SOLR_SOLR_PORT=8983
+      SOLR_SOLR_HOST: "solr6"
+      SOLR_SOLR_PORT: "8983"
       #Create the default alfresco and archive cores
-      - SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive
+      SOLR_CREATE_ALFRESCO_DEFAULTS: "alfresco,archive"
       #HTTP by default
-      - ALFRESCO_SECURE_COMMS=none
+      ALFRESCO_SECURE_COMMS: "secret"
+      JAVA_TOOL_OPTIONS:
+        "
+        -Dalfresco.secureComms.secret=secret
+        "
     ports:
       - 8083:8983 #Browser port
 
diff --git a/tests/environment/docker-compose-minimal.yml b/tests/environment/docker-compose-minimal.yml
index c3772a8d6..4e88eb8ee 100644
--- a/tests/environment/docker-compose-minimal.yml
+++ b/tests/environment/docker-compose-minimal.yml
@@ -28,7 +28,8 @@ services:
         -Ddb.url=jdbc:postgresql://postgres:5432/alfresco
         -Dsolr.host=solr6
         -Dsolr.port=8983
-        -Dsolr.secureComms=none
+        -Dsolr.secureComms=secret
+        -Dsolr.sharedSecret=secret
         -Dsolr.base.url=/solr
         -Dindex.subsystem.name=solr6
         -Dalfresco.restApi.basicAuthScheme=true
@@ -66,15 +67,19 @@ services:
     image: alfresco/alfresco-search-services:${SOLR6_TAG}
     environment:
       #Solr needs to know how to register itself with Alfresco
-      - SOLR_ALFRESCO_HOST=alfresco
-      - SOLR_ALFRESCO_PORT=8080
+      SOLR_ALFRESCO_HOST: "alfresco"
+      SOLR_ALFRESCO_PORT: "8080"
       #Alfresco needs to know how to call solr
-      - SOLR_SOLR_HOST=solr6
-      - SOLR_SOLR_PORT=8983
+      SOLR_SOLR_HOST: "solr6"
+      SOLR_SOLR_PORT: "8983"
       #Create the default alfresco and archive cores
-      - SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive
+      SOLR_CREATE_ALFRESCO_DEFAULTS: "alfresco,archive"
       #HTTP by default
-      - ALFRESCO_SECURE_COMMS=none
+      ALFRESCO_SECURE_COMMS: "secret"
+      JAVA_TOOL_OPTIONS:
+        "
+        -Dalfresco.secureComms.secret=secret
+        "
     ports:
       - 8083:8983 #Browser port