diff --git a/search-services/packaging/src/docker/6.x/docker-compose.yml b/search-services/packaging/src/docker/6.x/docker-compose.yml
index 29f5c7acc..82adbec74 100644
--- a/search-services/packaging/src/docker/6.x/docker-compose.yml
+++ b/search-services/packaging/src/docker/6.x/docker-compose.yml
@@ -18,7 +18,7 @@ services:
                 -Ddb.username=alfresco
                 -Ddb.password=alfresco
                 -Ddb.url=jdbc:postgresql://postgres:5432/alfresco
-                -Dsolr.host=solr6
+                -Dsolr.host=search
                 -Dsolr.port=8983
                 -Dsolr.secureComms=none
                 -Dsolr.base.url=/solr
@@ -58,7 +58,7 @@ services:
         ports:
             - 5432:5432
 
-    solr6:
+    search:
         # Also alfresco/alfresco-search-services:${SEARCH_TAG} can be used for external developers
         image: quay.io/alfresco/search-services:${SEARCH_TAG}
         mem_limit: 2500m
@@ -67,7 +67,7 @@ services:
             SOLR_ALFRESCO_HOST: "alfresco"
             SOLR_ALFRESCO_PORT: "8080"
             #Alfresco needs to know how to call solr
-            SOLR_SOLR_HOST: "solr6"
+            SOLR_SOLR_HOST: "search"
             SOLR_SOLR_PORT: "8983"
             #Create the default alfresco and archive cores
             SOLR_CREATE_ALFRESCO_DEFAULTS: "alfresco,archive"