diff --git a/search-services/packaging/config.properties b/search-services/packaging/config.properties
index a4c162486..8f47551f3 100644
--- a/search-services/packaging/config.properties
+++ b/search-services/packaging/config.properties
@@ -11,4 +11,6 @@ ${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\
 ${line.separator}SOLR_OPTS="$SOLR_OPTS -Dsolr.jetty.request.header.size=1000000 -Dsolr.jetty.threads.stop.timeout=300000 -Ddisable.configEdit=true"
 alfresco.search.config.win=REM Alfresco configuration. This file is automatically included by solr. You can define your custom settings here\
-${line.separator}set SOLR_OPTS=%SOLR_OPTS% -Dsolr.jetty.request.header.size=1000000 -Dsolr.jetty.threads.stop.timeout=300000 -Ddisable.configEdit=true
\ No newline at end of file
+${line.separator}set SOLR_OPTS=%SOLR_OPTS% -Dsolr.jetty.request.header.size=1000000 -Dsolr.jetty.threads.stop.timeout=300000 -Ddisable.configEdit=true
+solr.gc.token=#GC_TUNE="-XX:NewRatio=3 -XX:SurvivorRatio=4    etc.
+solr.gc.token.win=REM set GC_TUNE=-XX:NewRatio=3 -XX:SurvivorRatio=4     etc.
\ No newline at end of file
diff --git a/search-services/packaging/pom.xml b/search-services/packaging/pom.xml
index 6ef15cfdb..e5b0ad420 100644
--- a/search-services/packaging/pom.xml
+++ b/search-services/packaging/pom.xml
@@ -214,10 +214,10 @@
                                 <replace token="GC logging" value="GC logging${line.separator}${alfresco.gc.logs.win}" dir="${solr.directory}">
                                     <include name="**/bin/solr.in.cmd" />
                                 </replace>
-                                <replace token="#GC_TUNE=&quot;-XX:NewRatio=3 -XX:SurvivorRatio=4    etc." value="${alfresco.gc.tune}" dir="${solr.directory}">
+                                <replace token="${solr.gc.token}" 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}">
+                                <replace token="${solr.gc.token.win}" 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}">