diff --git a/nixosModules/bcachefs.nix b/nixosModules/bcachefs.nix
index 77ef9fc9..24968b87 100644
--- a/nixosModules/bcachefs.nix
+++ b/nixosModules/bcachefs.nix
@@ -1,10 +1,15 @@
 { lib, pkgs, ... }:
 
 {
+  # use latest kernel we can support to get more hardware support
+  boot.kernelPackages =
+    lib.mkForce
+      (pkgs.zfs.override { removeLinuxDRM = pkgs.hostPlatform.isAarch64; }).latestCompatibleLinuxPackages;
+  boot.zfs.removeLinuxDRM = lib.mkDefault pkgs.hostPlatform.isAarch64;
+
   # Enable bcachefs support
-  boot.supportedFilesystems.zfs = lib.mkForce false;
-  boot.kernelPackages = lib.mkOverride 0 pkgs.linuxPackages_latest;
   boot.supportedFilesystems.bcachefs = lib.mkDefault true;
+
   environment.systemPackages = with pkgs; [
     bcachefs-tools
     keyutils