diff --git a/modules/nixos/hardware/raspberry-pi/audio.nix b/modules/nixos/hardware/raspberry-pi/audio.nix
index 0d848f4..307182d 100644
--- a/modules/nixos/hardware/raspberry-pi/audio.nix
+++ b/modules/nixos/hardware/raspberry-pi/audio.nix
@@ -15,14 +15,14 @@ in
       [
         {
           name = "pisound-pi5-overlay";
-          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/share/raspberrypi-overlays/pisound-pi5-overlay.dts";
+          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/pisound-pi5-overlay.dts";
         }
       ]
       else
       [
         {
           name = "pisound-overlay";
-          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/share/raspberrypi-overlays/pisound-overlay.dts";
+          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/pisound-overlay.dts";
         }
       ]);
     };
diff --git a/modules/nixos/hardware/raspberry-pi/bluetooth.nix b/modules/nixos/hardware/raspberry-pi/bluetooth.nix
index 1467933..41cf356 100644
--- a/modules/nixos/hardware/raspberry-pi/bluetooth.nix
+++ b/modules/nixos/hardware/raspberry-pi/bluetooth.nix
@@ -15,14 +15,14 @@ in
       [
         {
           name = "disable-bt-pi5-overlay";
-          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/share/raspberrypi-overlays/disable-bt-pi5-overlay.dts";
+          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/disable-bt-pi5-overlay.dts";
         }
       ]
       else
       [
         {
           name = "disable-bt-overlay";
-          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/share/raspberrypi-overlays/disable-bt-overlay.dts";
+          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/disable-bt-overlay.dts";
         }
       ]);
     };
diff --git a/modules/nixos/hardware/raspberry-pi/default.nix b/modules/nixos/hardware/raspberry-pi/default.nix
index 087b134..4f66fb6 100644
--- a/modules/nixos/hardware/raspberry-pi/default.nix
+++ b/modules/nixos/hardware/raspberry-pi/default.nix
@@ -249,7 +249,7 @@ in
         [
           {
             name = "bcm2712d0-overlay";
-            dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/share/raspberrypi-overlays/bcm2712d0-overlay.dts";
+            dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/bcm2712d0-overlay.dts";
           }
         ]);
       };
diff --git a/modules/nixos/hardware/raspberry-pi/i2c.nix b/modules/nixos/hardware/raspberry-pi/i2c.nix
index 8fb59d2..590a587 100644
--- a/modules/nixos/hardware/raspberry-pi/i2c.nix
+++ b/modules/nixos/hardware/raspberry-pi/i2c.nix
@@ -14,46 +14,46 @@ in
       [
         {
           name = "i2c0-pi5-overlay";
-          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/share/raspberrypi-overlays/i2c0-pi5-overlay.dts";
+          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/i2c0-pi5-overlay.dts";
         }
         {
           name = "i2c1-pi5-overlay";
-          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/share/raspberrypi-overlays/i2c1-pi5-overlay.dts";
+          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/i2c1-pi5-overlay.dts";
         }
         {
           name = "i2c2-pi5-overlay";
-          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/share/raspberrypi-overlays/i2c2-pi5-overlay.dts";
+          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/i2c2-pi5-overlay.dts";
         }
         {
           name = "i2c3-pi5-overlay";
-          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/share/raspberrypi-overlays/i2c3-pi5-overlay.dts";
+          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/i2c3-pi5-overlay.dts";
         }
       ]
       else
       [
         {
           name = "i2c0-overlay";
-          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/share/raspberrypi-overlays/i2c0-overlay.dts";
+          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/i2c0-overlay.dts";
         }
         {
           name = "i2c1-overlay";
-          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/share/raspberrypi-overlays/i2c1-overlay.dts";
+          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/i2c1-overlay.dts";
         }
         {
           name = "i2c3-overlay";
-          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/share/raspberrypi-overlays/i2c3-overlay.dts";
+          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/i2c3-overlay.dts";
         }
         {
           name = "i2c4-overlay";
-          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/share/raspberrypi-overlays/i2c4-overlay.dts";
+          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/i2c4-overlay.dts";
         }
         {
           name = "i2c5-overlay";
-          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/share/raspberrypi-overlays/i2c5-overlay.dts";
+          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/i2c5-overlay.dts";
         }
         {
           name = "i2c6-overlay";
-          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/share/raspberrypi-overlays/i2c6-overlay.dts";
+          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/i2c6-overlay.dts";
         }
       ]);
     };
diff --git a/modules/nixos/hardware/raspberry-pi/modesetting.nix b/modules/nixos/hardware/raspberry-pi/modesetting.nix
index d50c176..e8f6992 100644
--- a/modules/nixos/hardware/raspberry-pi/modesetting.nix
+++ b/modules/nixos/hardware/raspberry-pi/modesetting.nix
@@ -14,20 +14,20 @@ in
       [
         {
           name = "vc4-fkms-v3d-pi4-overlay";
-          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/share/raspberrypi-overlays/vc4-fkms-v3d-pi4-overlay.dts";
+          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/vc4-fkms-v3d-pi4-overlay.dts";
         }
       ] ++ (if (variant == "5") then 
       [
         {
           name = "vc4-kms-v3d-pi5-overlay";
-          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/share/raspberrypi-overlays/vc4-kms-v3d-pi5-overlay.dts";
+          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/vc4-kms-v3d-pi5-overlay.dts";
         }
       ]
       else
       [
         {
           name = "vc4-kms-v3d-pi4-overlay";
-          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/share/raspberrypi-overlays/vc4-kms-v3d-pi4-overlay.dts";
+          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/vc4-kms-v3d-pi4-overlay.dts";
         }
       ]);
     };
diff --git a/modules/nixos/hardware/raspberry-pi/pwm.nix b/modules/nixos/hardware/raspberry-pi/pwm.nix
index 7162723..7c5e40e 100644
--- a/modules/nixos/hardware/raspberry-pi/pwm.nix
+++ b/modules/nixos/hardware/raspberry-pi/pwm.nix
@@ -16,8 +16,8 @@ in
           filter = (if (variant == "5") then "*pi5*" else "*rpi-4-b*");
           dtsFile = (
             if (variant == "5") 
-            then "${pkgs.${namespace}.raspberrypi-overlays}/share/raspberrypi-overlays/pwm-pio-overlay.dts" 
-            else "${pkgs.${namespace}.raspberrypi-overlays}/share/raspberrypi-overlays/pwm1-overlay.dts"
+            then "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/pwm-pio-overlay.dts" 
+            else "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/pwm1-overlay.dts"
           );
         }
       ];
diff --git a/modules/nixos/hardware/raspberry-pi/wifi.nix b/modules/nixos/hardware/raspberry-pi/wifi.nix
index dea5c1f..6195de3 100644
--- a/modules/nixos/hardware/raspberry-pi/wifi.nix
+++ b/modules/nixos/hardware/raspberry-pi/wifi.nix
@@ -15,18 +15,18 @@ in
       [
         {
           name = "disable-wifi-pi5-overlay";
-          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/share/raspberrypi-overlays/disable-wifi-pi5-overlay.dts";
+          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/disable-wifi-pi5-overlay.dts";
         }
       ]
       else
       [
         {
           name = "disable-wifi-overlay";
-          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/share/raspberrypi-overlays/disable-wifi-overlay.dts";
+          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/disable-wifi-overlay.dts";
         }
         {
           name = "wifimac-overlay";
-          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/share/raspberrypi-overlays/wifimac-overlay.dts";
+          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/wifimac-overlay.dts";
         }
       ]);
     };