diff --git a/flake.nix b/flake.nix
index c936372..561a847 100644
--- a/flake.nix
+++ b/flake.nix
@@ -30,17 +30,6 @@
           disko = pkgs.callPackage ./package.nix { };
           disko-doc = pkgs.callPackage ./doc.nix { };
           default = self.packages.${system}.disko;
-          # The way bcachefs support is maintained in nixpkgs is prone to breakage.
-          # That's why we need to maintain a fork here:
-          # https://github.com/NixOS/nixpkgs/issues/212086
-          linux-bcachefs = pkgs.callPackage ./linux-testing-bcachefs.nix { };
-        });
-      legacyPackages = forAllSystems (system:
-        let
-          pkgs = nixpkgs.legacyPackages.${system};
-        in
-        {
-          linuxPackages_bcachefs = pkgs.linuxPackagesFor self.packages.${pkgs.system}.linux-bcachefs;
         });
       # TODO: disable bios-related tests on aarch64...
       # Run checks: nix flake check -L
diff --git a/linux-testing-bcachefs.nix b/linux-testing-bcachefs.nix
deleted file mode 100644
index 185a9b8..0000000
--- a/linux-testing-bcachefs.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-# nixpkgs's variant is broken because they have non-applying patches on top of the latest kernel,
-# instead of using kernel.
-
-{ buildLinux
-, fetchFromGitHub
-, ...
-} @ args:
-buildLinux (args // {
-  # NOTE: bcachefs-tools should be updated simultaneously to preserve compatibility
-  version = "6.3.0-2023-05-21";
-
-  modDirVersion = "6.3.0";
-
-  src = fetchFromGitHub {
-    owner = "koverstreet";
-    repo = "bcachefs";
-    rev = "baaa442cb4abfea84549a3cee863829ee06fb615";
-    sha256 = "sha256-c3WQpUopfqHNkmrDS3WDW4WxXIiKobjbNLjwCQSh0zA=";
-  };
-
-  kernelPatches = (args.kernelPatches or [ ]) ++ [{
-    name = "bcachefs-config";
-    patch = null;
-    extraConfig = ''
-      BCACHEFS_FS m
-    '';
-  }];
-} // (args.argsOverride or { }))
diff --git a/tests/bcachefs.nix b/tests/bcachefs.nix
index 609165a..0b7274a 100644
--- a/tests/bcachefs.nix
+++ b/tests/bcachefs.nix
@@ -1,9 +1,6 @@
 { pkgs ? (import <nixpkgs> { })
 , makeDiskoTest ? (pkgs.callPackage ./lib.nix { }).makeDiskoTest
 }:
-let
-  linux-bcachefs = pkgs.callPackage ../linux-testing-bcachefs.nix { };
-in
 makeDiskoTest {
   name = "bcachefs";
   disko-config = ../example/bcachefs.nix;
@@ -22,6 +19,6 @@ makeDiskoTest {
         });
       })
     ];
-    boot.kernelPackages = pkgs.lib.mkForce (pkgs.recurseIntoAttrs (pkgs.linuxPackagesFor linux-bcachefs));
+    boot.kernelPackages = pkgs.lib.mkForce (pkgs.recurseIntoAttrs pkgs.linuxKernel.packages.linux_testing_bcachefs);
   };
 }