diff --git a/systems/aarch64-linux/macbook-pro-nixos/boot.nix b/systems/aarch64-linux/macbook-pro-nixos/boot.nix
index e46d912..5748dd7 100644
--- a/systems/aarch64-linux/macbook-pro-nixos/boot.nix
+++ b/systems/aarch64-linux/macbook-pro-nixos/boot.nix
@@ -21,6 +21,12 @@
     '';
     m1n1CustomLogo = ./NixOS.png;
 
-    supportedFilesystems = [ "apfs" ];
+    initrd = {
+      availableKernelModules = lib.mkForce [ ];
+      kernelModules = {
+        bcachefs = lib.mkForce false;
+      };
+    };
+    supportedFilesystems = lib.mkForce [ "apfs" ];
   };
 }
diff --git a/systems/aarch64-linux/pi4/boot.nix b/systems/aarch64-linux/pi4/boot.nix
index 9321540..4fd937d 100755
--- a/systems/aarch64-linux/pi4/boot.nix
+++ b/systems/aarch64-linux/pi4/boot.nix
@@ -13,6 +13,12 @@
     #   kernelPackages = kernelBundle.linuxPackages_rpi4;
     # kernelPackages = pkgs.${namespace}.linuxPackages_cachyos-lto;
     kernelPackages = pkgs.${namespace}.linuxPackages_rpi4-lts;
+    initrd = {
+      availableKernelModules = lib.mkForce [ ];
+      kernelModules = {
+        bcachefs = lib.mkForce false;
+      };
+    };
     supportedFilesystems = lib.mkForce [ ];
   };
 
diff --git a/systems/aarch64-linux/pi5/boot.nix b/systems/aarch64-linux/pi5/boot.nix
index 69f2095..3f28b5e 100755
--- a/systems/aarch64-linux/pi5/boot.nix
+++ b/systems/aarch64-linux/pi5/boot.nix
@@ -11,6 +11,12 @@
     #   firmwarePackage = pkgs.raspberrypifw;
     # };
     kernelPackages = pkgs.${namespace}.linuxPackages_rpi5-lts;
+    initrd = {
+      availableKernelModules = lib.mkForce [ ];
+      kernelModules = {
+        bcachefs = lib.mkForce false;
+      };
+    };
     supportedFilesystems = lib.mkForce [ ];
   };
 
diff --git a/systems/aarch64-linux/pi5/default.nix b/systems/aarch64-linux/pi5/default.nix
index 29a3bc9..755fadd 100644
--- a/systems/aarch64-linux/pi5/default.nix
+++ b/systems/aarch64-linux/pi5/default.nix
@@ -136,13 +136,6 @@
 
   boot.supportedFilesystems = [ "bcachefs" ];
   fileSystems."/etc".neededForBoot = true;
-  fileSystems."/data" = {
-    device = "/dev/disk/by-uuid/a85420cc-a026-4100-80d2-a999081d792a";
-    fsType = "bcachefs";
-    options = [
-      "nofail"
-    ];
-  };
 
   programs.seahorse.enable = false;
 }