diff --git a/buildapp/terrarumlinux_arm/AppRun b/buildapp/terrarumlinux_arm/AppRun
index fafb1648b..8176a6f6b 100755
--- a/buildapp/terrarumlinux_arm/AppRun
+++ b/buildapp/terrarumlinux_arm/AppRun
@@ -1,4 +1,4 @@
 #!/bin/bash
 cd "${0%/*}"
 GRAAL_MODULE_PATH=compiler-23.1.10.jar:compiler-management-23.1.10.jar:truffle-compiler-23.1.10.jar:truffle-api-23.1.10.jar:truffle-runtime-23.1.10.jar:polyglot-23.1.10.jar:collections-23.1.10.jar:word-23.1.10.jar:nativeimage-23.1.10.jar:jniutils-23.1.10.jar
-./out/runtime-linux-arm/bin/java --upgrade-module-path=$GRAAL_MODULE_PATH -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI --add-exports=java.base/jdk.internal.misc=jdk.internal.vm.compiler -Dswing.aatext=true -Dawt.useSystemAAFontSettings=lcd -jar ./out/TerrarumBuild.jar
+./out/runtime-linux-arm/bin/java --upgrade-module-path=$GRAAL_MODULE_PATH -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseZGC -XX:+ZGenerational -XX:+UseDynamicNumberOfGCThreads --add-exports=java.base/jdk.internal.misc=jdk.internal.vm.compiler -Dswing.aatext=true -Dawt.useSystemAAFontSettings=lcd -jar ./out/TerrarumBuild.jar
diff --git a/buildapp/terrarumlinux_x86/AppRun b/buildapp/terrarumlinux_x86/AppRun
index 5f3bbd772..69d6193ab 100755
--- a/buildapp/terrarumlinux_x86/AppRun
+++ b/buildapp/terrarumlinux_x86/AppRun
@@ -1,4 +1,4 @@
 #!/bin/bash
 cd "${0%/*}"
 GRAAL_MODULE_PATH=compiler-23.1.10.jar:compiler-management-23.1.10.jar:truffle-compiler-23.1.10.jar:truffle-api-23.1.10.jar:truffle-runtime-23.1.10.jar:polyglot-23.1.10.jar:collections-23.1.10.jar:word-23.1.10.jar:nativeimage-23.1.10.jar:jniutils-23.1.10.jar
-./out/runtime-linux-x86/bin/java --upgrade-module-path=$GRAAL_MODULE_PATH -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI --add-exports=java.base/jdk.internal.misc=jdk.internal.vm.compiler -Dswing.aatext=true -Dawt.useSystemAAFontSettings=lcd -jar ./out/TerrarumBuild.jar
+./out/runtime-linux-x86/bin/java --upgrade-module-path=$GRAAL_MODULE_PATH -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseZGC -XX:+ZGenerational -XX:+UseDynamicNumberOfGCThreads --add-exports=java.base/jdk.internal.misc=jdk.internal.vm.compiler -Dswing.aatext=true -Dawt.useSystemAAFontSettings=lcd -jar ./out/TerrarumBuild.jar
diff --git a/buildapp/terrarummac_arm/Terrarum.sh b/buildapp/terrarummac_arm/Terrarum.sh
index f9f7ab425..b92bc0efb 100755
--- a/buildapp/terrarummac_arm/Terrarum.sh
+++ b/buildapp/terrarummac_arm/Terrarum.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 cd "${0%/*}"
 GRAAL_MODULE_PATH=compiler-23.1.10.jar:compiler-management-23.1.10.jar:truffle-compiler-23.1.10.jar:truffle-api-23.1.10.jar:truffle-runtime-23.1.10.jar:polyglot-23.1.10.jar:collections-23.1.10.jar:word-23.1.10.jar:nativeimage-23.1.10.jar:jniutils-23.1.10.jar
-./out/runtime-osx-arm/bin/java --upgrade-module-path=$GRAAL_MODULE_PATH -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI --add-exports=java.base/jdk.internal.misc=jdk.internal.vm.compiler -jar ./out/TerrarumBuild.jar
+./out/runtime-osx-arm/bin/java --upgrade-module-path=$GRAAL_MODULE_PATH -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseZGC -XX:+ZGenerational -XX:+UseDynamicNumberOfGCThreads --add-exports=java.base/jdk.internal.misc=jdk.internal.vm.compiler -jar ./out/TerrarumBuild.jar
diff --git a/buildapp/terrarummac_x86/Terrarum.sh b/buildapp/terrarummac_x86/Terrarum.sh
index 9fce61a06..a787e9d87 100755
--- a/buildapp/terrarummac_x86/Terrarum.sh
+++ b/buildapp/terrarummac_x86/Terrarum.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 cd "${0%/*}"
 GRAAL_MODULE_PATH=compiler-23.1.10.jar:compiler-management-23.1.10.jar:truffle-compiler-23.1.10.jar:truffle-api-23.1.10.jar:truffle-runtime-23.1.10.jar:polyglot-23.1.10.jar:collections-23.1.10.jar:word-23.1.10.jar:nativeimage-23.1.10.jar:jniutils-23.1.10.jar
-./out/runtime-osx-x86/bin/java --upgrade-module-path=$GRAAL_MODULE_PATH -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI --add-exports=java.base/jdk.internal.misc=jdk.internal.vm.compiler -jar ./out/TerrarumBuild.jar
+./out/runtime-osx-x86/bin/java --upgrade-module-path=$GRAAL_MODULE_PATH -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseZGC -XX:+ZGenerational -XX:+UseDynamicNumberOfGCThreads --add-exports=java.base/jdk.internal.misc=jdk.internal.vm.compiler -jar ./out/TerrarumBuild.jar
diff --git a/buildapp/terrarumwindows_x86/Terrarum.c b/buildapp/terrarumwindows_x86/Terrarum.c
index a540dbdd7..4445bacfb 100644
--- a/buildapp/terrarumwindows_x86/Terrarum.c
+++ b/buildapp/terrarumwindows_x86/Terrarum.c
@@ -9,7 +9,7 @@ int main() {
 
     char cmd[] = "\".\\out\\runtime-windows-x86\\bin\\java.exe\" "
                  "--upgrade-module-path=compiler-23.1.10.jar;compiler-management-23.1.10.jar;truffle-compiler-23.1.10.jar;truffle-api-23.1.10.jar;truffle-runtime-23.1.10.jar;polyglot-23.1.10.jar;collections-23.1.10.jar;word-23.1.10.jar;nativeimage-23.1.10.jar;jniutils-23.1.10.jar "
-                 "-XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI "
+                 "-XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseZGC -XX:+ZGenerational -XX:+UseDynamicNumberOfGCThreads "
                  "--add-exports=java.base/jdk.internal.misc=jdk.internal.vm.compiler "
                  "-jar \".\\out\\TerrarumBuild.jar\"";
 
diff --git a/src/net/torvald/terrarum/Principii.java b/src/net/torvald/terrarum/Principii.java
index 6668fbf4f..9530923f4 100644
--- a/src/net/torvald/terrarum/Principii.java
+++ b/src/net/torvald/terrarum/Principii.java
@@ -53,6 +53,7 @@ public class Principii {
         }
     }
 
+    private static final String GRAAL_MODULE_PATH = "compiler-23.1.10.jar:compiler-management-23.1.10.jar:truffle-compiler-23.1.10.jar:truffle-api-23.1.10.jar:truffle-runtime-23.1.10.jar:polyglot-23.1.10.jar:collections-23.1.10.jar:word-23.1.10.jar:nativeimage-23.1.10.jar:jniutils-23.1.10.jar";
 
     public static void main(String[] args) {
 
@@ -130,6 +131,13 @@ public class Principii {
         List<String> userDefinedExtraCmds = Arrays.stream(userDefinedExtraCmd0.split(" +")).filter((it) -> !it.isBlank()).toList();
         ArrayList<String> cmd0 = new ArrayList<>();
         cmd0.add(runtime);
+        cmd0.add("--upgrade-module-path="+GRAAL_MODULE_PATH);
+        cmd0.add("-XX:+UnlockExperimentalVMOptions");
+        cmd0.add("-XX:+EnableJVMCI");
+        cmd0.add("-XX:+UseZGC");
+        cmd0.add("-XX:+ZGenerational");
+        cmd0.add("-XX:+UseDynamicNumberOfGCThreads");
+        cmd0.add("--add-exports=java.base/jdk.internal.misc=jdk.internal.vm.compiler");
         cmd0.addAll(extracmds);
         cmd0.addAll(userDefinedExtraCmds);
 //        cmd0.add("-Dhttps.protocols=SSLv3,TLSv1.2,TLSv1.1,TLSv1");