diff --git a/.run/KuTuApp-Client.run.xml b/.run/KuTuApp-Client.run.xml
index c73ca0533..d04e9b907 100644
--- a/.run/KuTuApp-Client.run.xml
+++ b/.run/KuTuApp-Client.run.xml
@@ -2,7 +2,7 @@
   <configuration default="false" name="KuTuApp-Client" type="Application" factoryName="Application">
     <option name="MAIN_CLASS_NAME" value="ch.seidel.kutu.KuTuApp" />
     <module name="KuTu" />
-    <option name="VM_PARAMETERS" value="--add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.time=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/sun.util.calendar=ALL-UNNAMED" />
+    <option name="VM_PARAMETERS" value="--add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.time=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/sun.util.calendar=ALL-UNNAMED -XX:+UseZGC -XX:+ZGenerational -XX:+ExitOnOutOfMemoryError" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.client" />
     <extension name="coverage">
       <pattern>
diff --git a/.run/KuTuApp-Server.run.xml b/.run/KuTuApp-Server.run.xml
index a4c652b65..6b8d9bb81 100644
--- a/.run/KuTuApp-Server.run.xml
+++ b/.run/KuTuApp-Server.run.xml
@@ -2,7 +2,7 @@
   <configuration default="false" name="KuTuApp-Server" type="Application" factoryName="Application">
     <option name="MAIN_CLASS_NAME" value="ch.seidel.kutu.KuTuServer" />
     <module name="KuTu" />
-    <option name="VM_PARAMETERS" value="--add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.time=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/sun.util.calendar=ALL-UNNAMED -Duser.timezone=UTC" />
+    <option name="VM_PARAMETERS" value="--add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.time=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/sun.util.calendar=ALL-UNNAMED -Duser.timezone=UTC -XX:+UseZGC -XX:+ZGenerational -XX:+ExitOnOutOfMemoryError" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.server" />
     <extension name="coverage">
       <pattern>
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 724acf210..10ff1d912 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -47,14 +47,7 @@ ENTRYPOINT [ "java", "-cp", ".:app.jar:libs/*" \
     , "--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" \
     , "--add-opens=java.base/sun.nio.ch=ALL-UNNAMED" \
     , "--add-opens=java.base/sun.util.calendar=ALL-UNNAMED" \
-    , "-XX:+UseG1GC" \
-    , "-XX:+UseContainerSupport" \
-    , "-XX:MaxGCPauseMillis=30" \
-    , "-XX:InitiatingHeapOccupancyPercent=70" \
-    , "-XX:MaxRAMPercentage=80" \
-    , "-XX:+ParallelRefProcEnabled" \
-    , "-XX:+PerfDisableSharedMem" \
-    , "-XX:+OptimizeStringConcat" \
-    , "-XX:+HeapDumpOnOutOfMemoryError" \
-    , "-XX:MetaspaceSize=96M" \
+    , "-XX:+UseZGC" \
+    , "-XX:+ZGenerational" \
+    , "-XX:+ExitOnOutOfMemoryError" \
     , "ch.seidel.kutu.KuTuServer"]
diff --git a/dockercompose/docker-compose.yaml b/dockercompose/docker-compose.yaml
index dda581e44..aab345ab6 100644
--- a/dockercompose/docker-compose.yaml
+++ b/dockercompose/docker-compose.yaml
@@ -76,6 +76,5 @@ volumes:
 
 networks:
   intern:
-    driver: bridge
   intern-prod:
     driver: bridge
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 1f150b9af..ad7e23fbf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -222,6 +222,9 @@
 											--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED
 											--add-opens=java.base/sun.nio.ch=ALL-UNNAMED
 											--add-opens=java.base/sun.util.calendar=ALL-UNNAMED
+											-XX:+UseZGC
+											-XX:+ZGenerational
+											-XX:+ExitOnOutOfMemoryError
 										</argument>
 									</arguments>
 								</configuration>