diff --git a/search-services/packaging/config.properties b/search-services/packaging/config.properties
index b2def0508..c8d949147 100644
--- a/search-services/packaging/config.properties
+++ b/search-services/packaging/config.properties
@@ -4,7 +4,7 @@ alfresco.search.logs=SOLR_LOGS_DIR=../../logs\
 ${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:NewRatio=3 -XX:SurvivorRatio=4 -XX:TargetSurvivorRatio=90 -XX:MaxTenuringThreshold=8 -XX:ConcGCThreads=4 -XX:ParallelGCThreads=4 -XX:PretenureSizeThreshold=64m -XX:+ParallelRefProcEnabled -XX:-OmitStackTraceInFastThrow"
+alfresco.gc.tune=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\