diff --git a/hosts/rico0/hardware/default.nix b/hosts/rico0/hardware/default.nix
index b66d27a..9ab3619 100644
--- a/hosts/rico0/hardware/default.nix
+++ b/hosts/rico0/hardware/default.nix
@@ -18,7 +18,6 @@
       efi.canTouchEfiVariables = true;
       systemd-boot.enable = true;
     };
-    supportedFilesystems = [ "vfat" "btrfs" "ext4" ];
   };
   powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
 }
diff --git a/hosts/rico0/hardware/filesystem.nix b/hosts/rico0/hardware/filesystem.nix
index 62259b9..a654d61 100644
--- a/hosts/rico0/hardware/filesystem.nix
+++ b/hosts/rico0/hardware/filesystem.nix
@@ -1,4 +1,8 @@
 _: {
+  boot = {
+    initrd.supportedFilesystems = [ "vfat" "btrfs" ];
+    supportedFilesystems = [ "vfat" "btrfs" "ext4" ];
+  };
   fileSystems = {
     "/" = {
       device = "/dev/disk/by-partlabel/RICO0_ROOT";
diff --git a/hosts/rico1/hardware/default.nix b/hosts/rico1/hardware/default.nix
index b66d27a..9ab3619 100644
--- a/hosts/rico1/hardware/default.nix
+++ b/hosts/rico1/hardware/default.nix
@@ -18,7 +18,6 @@
       efi.canTouchEfiVariables = true;
       systemd-boot.enable = true;
     };
-    supportedFilesystems = [ "vfat" "btrfs" "ext4" ];
   };
   powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
 }
diff --git a/hosts/rico1/hardware/filesystem.nix b/hosts/rico1/hardware/filesystem.nix
index 44dc339..e4e46d0 100644
--- a/hosts/rico1/hardware/filesystem.nix
+++ b/hosts/rico1/hardware/filesystem.nix
@@ -1,4 +1,8 @@
 _: {
+  boot = {
+    initrd.supportedFilesystems = [ "vfat" "btrfs" ];
+    supportedFilesystems = [ "vfat" "btrfs" "ext4" ];
+  };
   fileSystems = {
     "/" = {
       device = "/dev/disk/by-partlabel/RICO1_ROOT";
diff --git a/hosts/rico2/hardware/default.nix b/hosts/rico2/hardware/default.nix
index b66d27a..9ab3619 100644
--- a/hosts/rico2/hardware/default.nix
+++ b/hosts/rico2/hardware/default.nix
@@ -18,7 +18,6 @@
       efi.canTouchEfiVariables = true;
       systemd-boot.enable = true;
     };
-    supportedFilesystems = [ "vfat" "btrfs" "ext4" ];
   };
   powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
 }
diff --git a/hosts/rico2/hardware/filesystem.nix b/hosts/rico2/hardware/filesystem.nix
index c5b41ab..1f3f984 100644
--- a/hosts/rico2/hardware/filesystem.nix
+++ b/hosts/rico2/hardware/filesystem.nix
@@ -1,4 +1,8 @@
 _: {
+  boot = {
+    initrd.supportedFilesystems = [ "vfat" "btrfs" ];
+    supportedFilesystems = [ "vfat" "btrfs" "ext4" ];
+  };
   fileSystems = {
     "/" = {
       device = "/dev/disk/by-partlabel/RICO2_ROOT";
diff --git a/hosts/skipper/hardware/filesystem.nix b/hosts/skipper/hardware/filesystem.nix
index 29d5aa3..557ee19 100644
--- a/hosts/skipper/hardware/filesystem.nix
+++ b/hosts/skipper/hardware/filesystem.nix
@@ -11,7 +11,7 @@ _: {
         };
       };
     };
-    supportedFilesystems = [ "vfat" "ntfs" "exfat" "ext4" "btrfs" ];
+    supportedFilesystems = [ "vfat" "btrfs" "ext4" "exfat" "ntfs" ];
     resumeDevice = "/dev/vg0/swap";
   };
   fileSystems = {
diff --git a/hosts/wynne/hardware/default.nix b/hosts/wynne/hardware/default.nix
index 41eb6b1..b02842b 100644
--- a/hosts/wynne/hardware/default.nix
+++ b/hosts/wynne/hardware/default.nix
@@ -24,7 +24,6 @@
       efi.canTouchEfiVariables = true;
       systemd-boot.enable = true;
     };
-    supportedFilesystems = [ "vfat" "btrfs" "ext4" ];
   };
   powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
 }
diff --git a/hosts/wynne/hardware/filesystem.nix b/hosts/wynne/hardware/filesystem.nix
index 6384a3e..0c02097 100644
--- a/hosts/wynne/hardware/filesystem.nix
+++ b/hosts/wynne/hardware/filesystem.nix
@@ -1,4 +1,8 @@
 _: {
+  boot = {
+    initrd.supportedFilesystems = [ "vfat" "btrfs" ];
+    supportedFilesystems = [ "vfat" "btrfs" "ext4" "exfat" ];
+  };
   fileSystems = {
     "/" = {
       device = "/dev/disk/by-partlabel/WYNNE_ROOT";