diff --git a/bootstrap.json b/bootstrap.json
index 62ea1a3ea13..b1f5e1ddb58 100644
--- a/bootstrap.json
+++ b/bootstrap.json
@@ -8,20 +8,12 @@
         "version": "1.2.17"
     },
     "clientJvmArguments": [
-        "-Xmx256m",
-        "-Xss2m",
-        "-Dsun.java2d.noddraw=true",
-        "-XX:CompileThreshold=1500",
-        "-Xincgc",
-        "-XX:+UseConcMarkSweepGC",
-        "-XX:+UseParNewGC",
+        "-Dsun.java2d.noddraw=false",
+        "-XX:+UseG1GC",
         "-Djna.nosys=true"
     ],
     "clientJvm9Arguments": [
-        "-Xmx256m",
-        "-Xss2m",
-        "-Dsun.java2d.noddraw=true",
-        "-XX:CompileThreshold=1500",
+        "-Dsun.java2d.noddraw=false",
         "-Djna.nosys=true"
     ]
 }