diff --git a/common/run-app.sh b/common/run-app.sh
index 871a4f59b20b6c38f42b4418ec01e13ece1677d7..3f9401e4b01f95f029170cc94644320bcf0c8eca 100755
--- a/common/run-app.sh
+++ b/common/run-app.sh
@@ -6,7 +6,7 @@ if [[ "$SPRING_PROFILE" =~ "online" || "$SPRING_PROFILE" =~ "pre" ]]; then
   MEM_OPTS="-Xms3584m -Xmx3584m"
 fi
 
-JAVA_OPTS="-server $MEM_OPTS -Dspring.profiles.active=$SPRING_PROFILE -verbose.gc -Xloggc:gc.log \
+JAVA_OPTS="-server $MEM_OPTS -Dspring.profiles.active=$SPRING_PROFILE -XX:+UseG1GC -verbose.gc -Xloggc:gc.log \
  -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+PrintGCApplicationStoppedTime -XX:+HeapDumpOnOutOfMemoryError \
  -XX:+PrintGCApplicationConcurrentTime -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=5 -XX:GCLogFileSize=100M \
  -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=1099 -Dcom.sun.management.jmxremote.rmi.port=1099 \
diff --git a/fonts-common/run-app.sh b/fonts-common/run-app.sh
index 871a4f59b20b6c38f42b4418ec01e13ece1677d7..3f9401e4b01f95f029170cc94644320bcf0c8eca 100755
--- a/fonts-common/run-app.sh
+++ b/fonts-common/run-app.sh
@@ -6,7 +6,7 @@ if [[ "$SPRING_PROFILE" =~ "online" || "$SPRING_PROFILE" =~ "pre" ]]; then
   MEM_OPTS="-Xms3584m -Xmx3584m"
 fi
 
-JAVA_OPTS="-server $MEM_OPTS -Dspring.profiles.active=$SPRING_PROFILE -verbose.gc -Xloggc:gc.log \
+JAVA_OPTS="-server $MEM_OPTS -Dspring.profiles.active=$SPRING_PROFILE -XX:+UseG1GC -verbose.gc -Xloggc:gc.log \
  -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+PrintGCApplicationStoppedTime -XX:+HeapDumpOnOutOfMemoryError \
  -XX:+PrintGCApplicationConcurrentTime -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=5 -XX:GCLogFileSize=100M \
  -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=1099 -Dcom.sun.management.jmxremote.rmi.port=1099 \