diff --git a/modules/nixos/hardware/raspberry-pi/default.nix b/modules/nixos/hardware/raspberry-pi/default.nix
index 77517fa..087b134 100644
--- a/modules/nixos/hardware/raspberry-pi/default.nix
+++ b/modules/nixos/hardware/raspberry-pi/default.nix
@@ -167,7 +167,7 @@ in
       loader = {
         generic-extlinux-compatible = {
           enable = lib.mkDefault true;
-          useGenerationDeviceTree = false;
+          useGenerationDeviceTree = true;
         };
         grub.enable = lib.mkForce false;
       };
diff --git a/packages/raspberrypi/raspberrypi-overlays/default.nix b/packages/raspberrypi/raspberrypi-overlays/default.nix
index 9b928b0..d07d9b1 100644
--- a/packages/raspberrypi/raspberrypi-overlays/default.nix
+++ b/packages/raspberrypi/raspberrypi-overlays/default.nix
@@ -17,8 +17,8 @@ stdenvNoCC.mkDerivation rec {
   };
 
   installPhase = ''
-    mkdir -p $out/share/raspberrypi-overlays/
-    mv arch/arm/boot/dts/overlays/* "$out/share/raspberrypi-overlays/"
+    mkdir -p $out/dtbs/raspberrypi-overlays/
+    mv arch/arm/boot/dts/overlays/* "$out/dtbs/raspberrypi-overlays/"
   '';
 
   dontConfigure = true;
diff --git a/systems/aarch64-linux/pi5/default.nix b/systems/aarch64-linux/pi5/default.nix
index bf6c5f1..8a9a1f8 100644
--- a/systems/aarch64-linux/pi5/default.nix
+++ b/systems/aarch64-linux/pi5/default.nix
@@ -54,6 +54,7 @@
         disable-wifi.enable = true;
         modesetting.enable = true; 
         i2c.enable = true;
+        apply-overlays-dtmerge.enable = true;
       };
     };