diff --git a/docker-compose.yml b/docker-compose.yml
index 1af162a..51c611c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,6 +9,7 @@ services:
         environment:
             JAVA_OPTS: "
                 -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco
+                -Dsolr.host=search
                 -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
                 "
         depends_on:
@@ -18,8 +19,11 @@ services:
     postgres-acs:
         image: postgres:latest
     
-    solr6:
+    search:
         image: alfresco/alfresco-search-services:latest
+        environment:
+            - SOLR_ALFRESCO_HOST=platform
+            - SOLR_SOLR_HOST=search
 
     activemq:
         image: alfresco/alfresco-activemq:latest