diff --git a/docker-compose.yml b/docker-compose.yml
index 278f152..1824ad1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,7 +13,8 @@ services:
                 -Ddb.username=alfresco
                 -Ddb.password=alfresco
                 -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco
-                -Dindex.subsystem.name=noindex
+                -Dindex.subsystem.name=solr6
+                -Dsolr.host=search
                 -Dalfresco.host=localhost
                 -Dalfresco.port=8080
                 -Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos
@@ -41,13 +42,13 @@ services:
             - POSTGRES_DB=alfresco
         command: postgres -c max_connections=300 -c log_min_messages=LOG
     
-    solr6:
+    search:
         image: alfresco/alfresco-search-services:2.0.1
         mem_limit: 2g
         environment:
-            - SOLR_ALFRESCO_HOST=alfresco
+            - SOLR_ALFRESCO_HOST=platform
             - SOLR_ALFRESCO_PORT=8080
-            - SOLR_SOLR_HOST=solr6
+            - SOLR_SOLR_HOST=search
             - SOLR_SOLR_PORT=8983
             - SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive
             - ALFRESCO_SECURE_COMMS=none