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 1174827d3..ca4268e79 100644
--- a/search-services/packaging/src/docker/6.x/docker-compose.yml
+++ b/search-services/packaging/src/docker/6.x/docker-compose.yml
@@ -37,6 +37,10 @@ services:
   search:
     image: quay.io/alfresco/search-services:${SEARCH_TAG}
     environment:
+      #Replication properties
+      - REPLICATION_TYPE=master
+      #- REPLICATION_AFTER=commit,startup- SOLR_ALFRESCO_HOST=alfresco
+      #- REPLICATION_CONFIG_FILES=schema.xml,stopwords.txt- SOLR_ALFRESCO_PORT=8080
       #Solr needs to know how to register itself with Alfresco
       - SOLR_ALFRESCO_HOST=alfresco
       - SOLR_ALFRESCO_PORT=8080
@@ -51,6 +55,27 @@ services:
       - ENABLE_SPELLCHECK=${SEARCH_ENABLE_SPELLCHECK}
     ports:
       - 8083:8983 #Browser port
+  #search_slave:
+  #  image: quay.io/alfresco/search-services:${SEARCH_TAG}
+  #  environment:
+  #    #Replication properties
+  #    - REPLICATION_TYPE=slave
+  #    - REPLICATION_MASTER_HOST=search
+  #    - REPLICATION_MASTER_PORT=8983
+  #    #- REPLICATION_MASTER_PROTOCOL=http
+  #    #- REPLICATION_CORE_NAME=alfresco
+  #    #- REPLICATION_POLL_INTERVAL=00:00:60
+  #    #Solr needs to know how to register itself with Alfresco
+  #    - SOLR_ALFRESCO_HOST=alfresco
+  #    - SOLR_ALFRESCO_PORT=8080
+  #    #Alfresco needs to know how to call solr
+  #    - SOLR_SOLR_HOST=search
+  #    - SOLR_SOLR_PORT=8983
+  #    #Create the default alfresco and archive cores
+  #    - SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive
+  #  ports:
+  #    - 8084:8983 #Browser port
+
   activemq:
     image: alfresco/alfresco-activemq:5.15.6
     ports:
diff --git a/search-services/packaging/src/docker/search_config_setup.sh b/search-services/packaging/src/docker/search_config_setup.sh
index 40ad069e1..090a4c648 100644
--- a/search-services/packaging/src/docker/search_config_setup.sh
+++ b/search-services/packaging/src/docker/search_config_setup.sh
@@ -1,6 +1,47 @@
 #!/bin/bash
 set -e
 
+SOLR_CONFIG_FILE=$PWD/solrhome/templates/rerank/conf/solrconfig.xml
+if [[ $REPLICATION_TYPE == "master" ]]; then
+
+   findStringMaster='<requestHandler name="\/replication" class="solr\.ReplicationHandler" >'
+   replaceStringMaster="\n\t<lst name=\"master\"> \n"
+   if [[ $REPLICATION_AFTER == "" ]]; then
+      REPLICATION_AFTER=commit
+   fi
+   for i in $(echo $REPLICATION_AFTER | sed "s/,/ /g")
+   do
+      replaceStringMaster+="\t\t<str name=\"replicateAfter\">"$i"<\/str> \n"
+   done
+   if [[ ! -z "$REPLICATION_CONFIG_FILES" ]]; then
+      replaceStringMaster+="\t\t<str name=\"confFiles\">$REPLICATION_CONFIG_FILES<\/str> \n"
+   fi
+   replaceStringMaster+="\t<\/lst>"
+   sed -i -e "s/$findStringMaster/$findStringMaster$replaceStringMaster/g" $SOLR_CONFIG_FILE
+fi
+if [[ $REPLICATION_TYPE == "slave" ]]; then
+   if [[ $REPLICATION_MASTER_PROTOCOL == "" ]]; then
+      REPLICATION_MASTER_PROTOCOL=http
+   fi
+   if [[ $REPLICATION_MASTER_HOST == "" ]]; then
+      REPLICATION_MASTER_HOST=localhost
+   fi
+   if [[ $REPLICATION_MASTER_PORT == "" ]]; then
+      REPLICATION_MASTER_PORT=8083
+   fi
+   if [[ $REPLICATION_CORE_NAME == "" ]]; then
+      REPLICATION_CORE_NAME=alfresco
+   fi
+   if [[ $REPLICATION_POLL_INTERVAL == "" ]]; then
+      REPLICATION_POLL_INTERVAL=00:00:30
+   fi
+   sed -i 's/<requestHandler name="\/replication" class="org\.alfresco\.solr\.handler\.AlfrescoReplicationHandler">/<requestHandler name="\/replication" class="org\.alfresco\.solr\.handler\.AlfrescoReplicationHandler">\
+      <lst name="slave">\
+         <str name="masterUrl">'$REPLICATION_MASTER_PROTOCOL':\/\/'$REPLICATION_MASTER_HOST':'$REPLICATION_MASTER_PORT'\/solr\/'$REPLICATION_CORE_NAME'<\/str>\
+         <str name="pollInterval">'$REPLICATION_POLL_INTERVAL'<\/str>\
+      <\/lst>/g' $SOLR_CONFIG_FILE
+fi
+
 SOLR_IN_FILE=$PWD/solr.in.sh
 
 if [[ ! -z "$MAX_SOLR_RAM_PERCENTAGE" ]]; then