diff --git a/hosts/marvin/bootloader.nix b/hosts/marvin/bootloader.nix
index 0b19a689..89cdc649 100644
--- a/hosts/marvin/bootloader.nix
+++ b/hosts/marvin/bootloader.nix
@@ -11,7 +11,7 @@ in
   boot = {
     extraModulePackages = [ ];
     kernelModules = [ "kvm-amd" ];
-    kernelPackages = pkgs.linuxPackages_6_1;
+    kernelPackages = pkgs.linuxPackages_6_12;
     kernelParams = [ "nohibernate" ];
     supportedFilesystems = fileSystems;
     zfs.devNodes = "/dev/";
@@ -43,6 +43,7 @@ in
     kernel.sysctl = {
       "net.ipv4.ip_forward" = 1;
       "net.ipv6.conf.all.forwarding" = 1;
+      "amdgpu.cwsr_enable" = 0;
     };
 
     # ZFS Config
diff --git a/hosts/prefect/bootloader.nix b/hosts/prefect/bootloader.nix
index 4b312584..8355fd56 100644
--- a/hosts/prefect/bootloader.nix
+++ b/hosts/prefect/bootloader.nix
@@ -30,7 +30,7 @@ in
       supportedFilesystems = fileSystems;
     };
     supportedFilesystems = fileSystems;
-    kernelPackages = pkgs.linuxPackages_6_1;
+    kernelPackages = pkgs.linuxPackages_6_12;
     kernel.sysctl = {
       "net.ipv4.ip_forward" = true;
       "net.ipv6.conf.all.forwarding" = true;