diff --git a/modules/nixos/disko/default.nix b/modules/nixos/disko/default.nix
index 12082ce..7fd8907 100644
--- a/modules/nixos/disko/default.nix
+++ b/modules/nixos/disko/default.nix
@@ -121,6 +121,19 @@ in
             content = {
               type = "gpt";
               partitions = {
+                firmware = lib.mkIf cfg.firmware.enableFirmware {
+                  priority = 1;
+                  type = "0700";
+                  name = "${config.${namespace}.network.hostName}-FIRMWARE";
+                  start = "1M";
+                  end = "1G";
+                  content = {
+                    type = "filesystem";
+                    format = "vfat";
+                    mountpoint = "/boot/firmware";
+                    mountOptions = [ "umask=0077" ];
+                  };
+                };
                 ESP = {
                   priority = if cfg.enableFirmware then 2 else 1;
                   type = "EF00";
@@ -143,28 +156,28 @@ in
               };
             };
           };
-          firmware = lib.mkIf cfg.firmware.enableFirmware {
-            device = cfg.firmware.firmwareDisk;
-            type = "disk";
-            imageSize = "1G";
-            content = {
-              type = "table";
-              format = "msdos";
-              partitions = [
-                {
-                  name = "${config.${namespace}.network.hostName}-FIRMWARE";
-                  start = "1M";
-                  end = "1G";
-                  content = {
-                    type = "filesystem";
-                    format = "vfat";
-                    mountpoint = "/boot/firmware";
-                    mountOptions = [ "umask=0077" ];
-                  };
-                }
-              ];
-            };
-          };
+          # firmware = lib.mkIf cfg.firmware.enableFirmware {
+          #   device = cfg.firmware.firmwareDisk;
+          #   type = "disk";
+          #   imageSize = "1G";
+          #   content = {
+          #     type = "table";
+          #     format = "msdos";
+          #     partitions = [
+          #       {
+          #         name = "${config.${namespace}.network.hostName}-FIRMWARE";
+          #         start = "1M";
+          #         end = "1G";
+          #         content = {
+          #           type = "filesystem";
+          #           format = "vfat";
+          #           mountpoint = "/boot/firmware";
+          #           mountOptions = [ "umask=0077" ];
+          #         };
+          #       }
+          #     ];
+          #   };
+          # };
         };
 
         # configure Bcachefs
diff --git a/systems/aarch64-linux/pi5/boot.nix b/systems/aarch64-linux/pi5/boot.nix
index a1325b4..1f3eb45 100755
--- a/systems/aarch64-linux/pi5/boot.nix
+++ b/systems/aarch64-linux/pi5/boot.nix
@@ -33,11 +33,9 @@
   };
 
   specialisation = {
-    "linux-rpi".configuration = {
+    "linux-latest".configuration = {
       boot = {
-        kernelPackages = lib.mkOverride 90 pkgs.linuxPackages_latest;
-
-#         supportedFilesystems = lib.mkForce [ ];
+        kernelPackages = lib.mkOverride 90 pkgs.linuxPackages_pi5-16k;
       };
     };
   };