diff --git a/modules/nixos/hardware/raspberry-pi/default.nix b/modules/nixos/hardware/raspberry-pi/default.nix
index 6354909..00a1bc4 100644
--- a/modules/nixos/hardware/raspberry-pi/default.nix
+++ b/modules/nixos/hardware/raspberry-pi/default.nix
@@ -345,7 +345,10 @@ in
     # Common hardware settings
     hardware = {
       deviceTree = {
-        filter = lib.mkDefault (if (cfg.variant == "5") then "bcm2712-rpi-*.dtb" else "bcm2711-rpi-*.dtb");
+        enable = true;
+        package = config.boot.kernelPackages.kernel;
+        name = "bcm2712-rpi5-b.dtb";
+        filter = lib.mkDefault (if (cfg.variant == "5") then "bcm2712-rpi5-*.dtb" else "bcm2711-rpi4-*.dtb");
         overlays = (
           if (cfg.variant == "4") then
             [
@@ -369,24 +372,6 @@ in
                   };
                 '';
               }
-              # {
-              #   name = "enable-xhci";
-              #   dtsText = ''
-              #     /dts-v1/;
-              #     /plugin/;
-
-              #     / {
-              #       compatible = "brcm,bcm2711";
-              #       fragment@0 {
-              #         //target-path = "/scb/xhci@7e9c0000";
-              #         target = <&xhci>;
-              #         __overlay__ {
-              #           status = "okay";
-              #         };
-              #       };
-              #     };
-              #   '';
-              # }
             ]
           else
             [
diff --git a/systems/aarch64-linux/pi5/boot.nix b/systems/aarch64-linux/pi5/boot.nix
index 0fd855a..c30aec7 100755
--- a/systems/aarch64-linux/pi5/boot.nix
+++ b/systems/aarch64-linux/pi5/boot.nix
@@ -38,6 +38,7 @@
     "linux-latest".configuration = {
       boot = {
         kernelPackages = lib.mkOverride 90 pkgs.linuxPackages_pi5-16k;
+        loader.systemd-boot.installDeviceTree = true;
       };
     };
   };