diff --git a/search-services/packaging/config.properties b/search-services/packaging/config.properties
index c8d949147..a4c162486 100644
--- a/search-services/packaging/config.properties
+++ b/search-services/packaging/config.properties
@@ -5,6 +5,7 @@ ${line.separator}LOG4J_PROPS=$SOLR_LOGS_DIR/log4j.properties
 alfresco.gc.logs=GC_LOG_OPTS=""
 alfresco.gc.logs.win=REM set "GC_LOG_OPTS= "
 alfresco.gc.tune=GC_TUNE="-XX:+UseG1GC -XX:+PerfDisableSharedMem -XX:+ParallelRefProcEnabled -XX:MaxGCPauseMillis=250 -XX:+UseLargePages -XX:+AlwaysPreTouch -XX:+ExplicitGCInvokesConcurrent"
+alfresco.gc.tune.win=set GC_TUNE=-XX:+UseG1GC -XX:+PerfDisableSharedMem -XX:+ParallelRefProcEnabled -XX:MaxGCPauseMillis=250 -XX:+UseLargePages -XX:+AlwaysPreTouch -XX:+ExplicitGCInvokesConcurrent
 alfresco.search.logs.win=set SOLR_LOGS_DIR=..\\..\\logs\
 ${line.separator}set LOG4J_CONFIG=file:!SOLR_LOGS_DIR!\\log4j.properties
 alfresco.search.config=# Alfresco configuration. This file is automatically included by solr. You can define your custom settings here\
diff --git a/search-services/packaging/pom.xml b/search-services/packaging/pom.xml
index a9d65929d..6ef15cfdb 100644
--- a/search-services/packaging/pom.xml
+++ b/search-services/packaging/pom.xml
@@ -217,6 +217,9 @@
                                 <replace token="#GC_TUNE=&quot;-XX:NewRatio=3 -XX:SurvivorRatio=4    etc." value="${alfresco.gc.tune}" dir="${solr.directory}">
                                     <include name="**/bin/solr.in.sh" />
                                 </replace>
+                                <replace token="REM set GC_TUNE=-XX:NewRatio=3 -XX:SurvivorRatio=4     etc." value="${alfresco.gc.tune.win}" dir="${solr.directory}">
+                                    <include name="**/bin/solr.in.cmd" />
+                                </replace>
                                 <replace token="# Anything you add to the SOLR_OPTS" value="${alfresco.search.config}${line.separator}${line.separator}# Anything you add to the SOLR_OPTS" dir="${solr.directory}">
                                     <include name="**/bin/solr.in.sh" />
                                 </replace>