diff --git a/nixos/modules/services/misc/apache-kafka.nix b/nixos/modules/services/misc/apache-kafka.nix
index f3a650a260f1e..a147c341b6c1e 100644
--- a/nixos/modules/services/misc/apache-kafka.nix
+++ b/nixos/modules/services/misc/apache-kafka.nix
@@ -94,14 +94,12 @@ in {
         "-server"
         "-Xmx1G"
         "-Xms1G"
-        "-XX:+UseCompressedOops"
-        "-XX:+UseParNewGC"
-        "-XX:+UseConcMarkSweepGC"
-        "-XX:+CMSClassUnloadingEnabled"
-        "-XX:+CMSScavengeBeforeRemark"
-        "-XX:+DisableExplicitGC"
+        "-XX:+UseG1GC"
+        "-XX:+ExplicitGCInvokesConcurrent"
+        "-XX:InitiatingHeapOccupancyPercent=35"
+        "-XX:MaxGCPauseMillis=20"
+        "-XX:InitiatingHeapOccupancyPercent=35"
         "-Djava.awt.headless=true"
-        "-Djava.net.preferIPv4Stack=true"
       ];
       type = types.listOf types.str;
       example = [
diff --git a/nixos/tests/kafka.nix b/nixos/tests/kafka.nix
index 88e30b62baa2d..1fdd86e58196c 100644
--- a/nixos/tests/kafka.nix
+++ b/nixos/tests/kafka.nix
@@ -32,9 +32,15 @@ let
           zookeeper = "zookeeper1:2181";
           # These are the default options, but UseCompressedOops doesn't work with 32bit JVM
           jvmOptions = [
-            "-server" "-Xmx1G" "-Xms1G" "-XX:+UseParNewGC" "-XX:+UseConcMarkSweepGC" "-XX:+CMSClassUnloadingEnabled"
-            "-XX:+CMSScavengeBeforeRemark" "-XX:+DisableExplicitGC" "-Djava.awt.headless=true" "-Djava.net.preferIPv4Stack=true"
-          ] ++ optionals (! pkgs.stdenv.isi686 ) [ "-XX:+UseCompressedOops" ];
+            "-Xmx1G"
+            "-Xms1G"
+            "-XX:+UseG1GC"
+            "-XX:+ExplicitGCInvokesConcurrent"
+            "-XX:InitiatingHeapOccupancyPercent=35"
+            "-XX:MaxGCPauseMillis=20"
+            "-XX:InitiatingHeapOccupancyPercent=35"
+            "-Djava.awt.headless=true"
+          ];
         };
 
         networking.firewall.allowedTCPPorts = [ 9092 ];