diff --git a/search-services/alfresco-search/src/test/resources/test-files/master/conf/solrconfig.xml b/search-services/alfresco-search/src/test/resources/test-files/master/conf/solrconfig.xml
index caca72a0e..c52520953 100644
--- a/search-services/alfresco-search/src/test/resources/test-files/master/conf/solrconfig.xml
+++ b/search-services/alfresco-search/src/test/resources/test-files/master/conf/solrconfig.xml
@@ -188,7 +188,7 @@
     <queryResponseWriter name="xml" default="true"
                          class="solr.XMLResponseWriter" />
 
-    <requestHandler name="/replication" class="org.alfresco.solr.handler.AlfrescoReplicationHandler">
+    <requestHandler name="/replication" class="solr.ReplicationHandler">
         <lst name="master">
             <str name="replicateAfter">commit</str>
             <str name="confFiles">schema.xml</str>
diff --git a/search-services/alfresco-search/src/test/resources/test-files/slave/conf/solrconfig.xml b/search-services/alfresco-search/src/test/resources/test-files/slave/conf/solrconfig.xml
index b4fe36741..dbdff2aec 100644
--- a/search-services/alfresco-search/src/test/resources/test-files/slave/conf/solrconfig.xml
+++ b/search-services/alfresco-search/src/test/resources/test-files/slave/conf/solrconfig.xml
@@ -192,7 +192,7 @@
     <queryResponseWriter name="xml" default="true"
                          class="solr.XMLResponseWriter" />
 
-    <requestHandler name="/replication" class="org.alfresco.solr.handler.AlfrescoReplicationHandler">
+    <requestHandler name="/replication" class="solr.ReplicationHandler">
         <lst name="slave">
             <str name="masterUrl">{masterURL}</str>
             <str name="pollInterval">00:00:02</str>
diff --git a/search-services/packaging/src/docker/search_config_setup.sh b/search-services/packaging/src/docker/search_config_setup.sh
index 89688e905..75e4a4e30 100644
--- a/search-services/packaging/src/docker/search_config_setup.sh
+++ b/search-services/packaging/src/docker/search_config_setup.sh
@@ -18,7 +18,7 @@ LOG_PROPERTIES=$PWD/logs/log4j.properties
 
 if [[ $REPLICATION_TYPE == "master" ]]; then
 
-   findStringMaster='<requestHandler name="\/replication" class="org\.alfresco\.solr\.handler\.AlfrescoReplicationHandler">'
+   findStringMaster='<requestHandler name="\/replication" class="solr\.ReplicationHandler">'
 
    replaceStringMaster="\n\t<lst name=\"master\"> \n"
 
@@ -63,7 +63,7 @@ if [[ $REPLICATION_TYPE == "slave" ]]; 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">\
+   sed -i 's/<requestHandler name="\/replication" class="solr\.ReplicationHandler">/<requestHandler name="\/replication" class="solr\.ReplicationHandler">\
       <lst name="slave">\
          <str name="masterUrl">'$REPLICATION_MASTER_PROTOCOL':\/\/'$REPLICATION_MASTER_HOST':'$REPLICATION_MASTER_PORT'\/solr\/${solr.core.name}<\/str>\
          <str name="pollInterval">'$REPLICATION_POLL_INTERVAL'<\/str>\