diff --git a/systems/nixos-fw16/default.nix b/systems/nixos-fw16/default.nix
index c658ef3..cdeda39 100644
--- a/systems/nixos-fw16/default.nix
+++ b/systems/nixos-fw16/default.nix
@@ -107,6 +107,9 @@
     "big-parallel"
     "kvm"
     "nixos-test"
+    "gccarch-znver1"
+    "gccarch-znver2"
+    "gccarch-znver3"
     "gccarch-znver4"
   ];
   # nixpkgs.hostPlatform.gcc.arch = "znver2";
@@ -131,10 +134,10 @@
     # kernelPackages = pkgs.pkgsAMD64Microarchs.znver4.linuxPackages_cachyos;
 
     # 6.14 rc wohooo
-    # kernelPackages = pkgs.linuxPackages_cachyos-rc;
-    # kernelPackages = pkgs.pkgsAMD64Microarchs.znver4.linuxPackages_cachyos-rc;
-    # kernelPackages = pkgs.pkgsAMD64Microarchs.znver4.linuxPackages_cachyos;
-    kernelPackages = pkgs.linuxPackages_cachyos;
+    kernelPackages = pkgs.linuxPackages_cachyos-rc;
+    # kernelPackages = pkgs.pkgsAMD64Microarchs.znver2.linuxPackages_cachyos-rc;
+    # kernelPackages = pkgs.pkgsAMD64Microarchs.znver2.linuxPackages_cachyos;
+    # kernelPackages = pkgs.linuxPackages_cachyos;
 
     kernelPatches = [ ];
     kernelParams = [
@@ -246,13 +249,13 @@
       };
 
       # Do not manage HID devices with powertop to prevent annoying keyboard/mouse sleeps
-      powertop.postStart = ''
-        HIDDEVICES=$(ls /sys/bus/usb/drivers/usbhid | grep -oE '^[0-9]+-[0-9\.]+' | sort -u)
-        for i in $HIDDEVICES; do
-          echo -n "Enabling " | cat - /sys/bus/usb/devices/$i/product
-          echo 'on' > /sys/bus/usb/devices/$i/power/control
-        done
-      '';
+      # powertop.postStart = ''
+      # HIDDEVICES=$(ls /sys/bus/usb/drivers/usbhid | grep -oE '^[0-9]+-[0-9\.]+' | sort -u)
+      # for i in $HIDDEVICES; do
+      #   echo -n "Enabling " | cat - /sys/bus/usb/devices/$i/product
+      #   echo 'on' > /sys/bus/usb/devices/$i/power/control
+      # done
+      # '';
 
       # This manually configures the automatically created network-adresses service to be more flexible
       # regarding booting without the the device being available on boot