diff --git a/docker-compose.yml b/docker-compose.yml
index 14bed89..bbed8ec 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -40,6 +40,17 @@ services:
             - POSTGRES_USER=alfresco
             - POSTGRES_DB=alfresco
         command: postgres -c max_connections=300 -c log_min_messages=LOG
+    
+    solr6:
+        image: alfresco/alfresco-search-services:2.0.1
+        mem_limit: 2g
+        environment:
+            - SOLR_ALFRESCO_HOST=alfresco
+            - SOLR_ALFRESCO_PORT=8080
+            - SOLR_SOLR_HOST=solr6
+            - SOLR_SOLR_PORT=8983
+            - SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive
+            - ALFRESCO_SECURE_COMMS=none
 
     activemq:
         image: alfresco/alfresco-activemq:5.15.8