diff --git a/start-6001-to-16000m.sh b/start-6001-to-16000m.sh
index 567b5fb..0434103 100644
--- a/start-6001-to-16000m.sh
+++ b/start-6001-to-16000m.sh
@@ -33,7 +33,7 @@ fi
 # Limits Java JVM stack size and maximum heap usage.
 # Comment out for bigger systems, e.g. non-routers
 # or when API documentation is enabled
-JVM_MEMORY_ARGS="-Xss1024m -Xmx4128m -XX:MaxRAM=4172m -XX:+UseSerialGC"
+JVM_MEMORY_ARGS="-XX:MaxRAMPercentage=40 -XX:+UseG1GC -Xss512k -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=./heapdump.hprof -Xlog:gc*:file=gc.log:time,uptime,level,tags"
 
 # Although java.net.preferIPv4Stack is supposed to be false
 # by default in Java 11, on some platforms (e.g. FreeBSD 12),