diff --git a/flake.lock b/flake.lock
index 5d6ca0c..50e4485 100644
--- a/flake.lock
+++ b/flake.lock
@@ -6,14 +6,14 @@
         "lastModified": 1717081637,
         "narHash": "sha256-s4zJh6r3VhiquO54KWZ78dVCH1BmlphY9zEB9BidNyo=",
         "owner": "raspberrypi",
-        "repo": "libcamera-apps",
+        "repo": "rpicam-apps",
         "rev": "49344f2a8d1817558d4e6463032fcf11be618b38",
         "type": "github"
       },
       "original": {
         "owner": "raspberrypi",
         "ref": "v1.5.0",
-        "repo": "libcamera-apps",
+        "repo": "rpicam-apps",
         "type": "github"
       }
     },
@@ -53,17 +53,17 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1718732645,
-        "narHash": "sha256-Zv8FapPPVVP5sqty4DWxSaL4p8sFuoAEglelBtSIhm0=",
+        "lastModified": 1718835956,
+        "narHash": "sha256-wM9v2yIxClRYsGHut5vHICZTK7xdrUGfrLkXvSuv6s4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9be7393d7204ba14ead6ec4f0381cc91bfb2aa24",
+        "rev": "dd457de7e08c6d06789b1f5b88fc9327f4d96309",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
+        "ref": "nixos-24.05",
         "repo": "nixpkgs",
-        "rev": "9be7393d7204ba14ead6ec4f0381cc91bfb2aa24",
         "type": "github"
       }
     },
@@ -92,8 +92,8 @@
       },
       "original": {
         "owner": "RPi-Distro",
+        "ref": "bookworm",
         "repo": "bluez-firmware",
-        "rev": "78d6a07730e2d20c035899521ab67726dc028e1c",
         "type": "github"
       }
     },
@@ -109,8 +109,8 @@
       },
       "original": {
         "owner": "RPi-Distro",
+        "ref": "bookworm",
         "repo": "firmware-nonfree",
-        "rev": "223ccf3a3ddb11b3ea829749fbbba4d65b380897",
         "type": "github"
       }
     },
@@ -134,17 +134,17 @@
     "rpi-linux-6_6-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1718722155,
-        "narHash": "sha256-WKlxHAAvDRN10M9pBmF3rNmXKd3uT2hv2/uxASa1LnQ=",
+        "lastModified": 1716545726,
+        "narHash": "sha256-UWUTeCpEN7dlFSQjog6S3HyEWCCnaqiUqV5KxCjYink=",
         "owner": "raspberrypi",
         "repo": "linux",
-        "rev": "da87f91ad8450ccc5274cd7b6ba8d823b396c96f",
+        "rev": "c1432b4bae5b6582f4d32ba381459f33c34d1424",
         "type": "github"
       },
       "original": {
         "owner": "raspberrypi",
+        "ref": "stable_20240529",
         "repo": "linux",
-        "rev": "da87f91ad8450ccc5274cd7b6ba8d823b396c96f",
         "type": "github"
       }
     },
diff --git a/flake.nix b/flake.nix
index 730f7a5..0d88847 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,14 +2,14 @@
   description = "raspberry-pi nixos configuration";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/9be7393d7204ba14ead6ec4f0381cc91bfb2aa24"; # 2024-06-18
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
     u-boot-src = {
       flake = false;
       url = "https://ftp.denx.de/pub/u-boot/u-boot-2024.07-rc4.tar.bz2";
     };
     rpi-linux-6_6-src = {
       flake = false;
-      url = "github:raspberrypi/linux/da87f91ad8450ccc5274cd7b6ba8d823b396c96f"; # 2024-06-17
+      url = "github:raspberrypi/linux/stable_20240529";
     };
     rpi-firmware-src = {
       flake = false;
@@ -17,15 +17,15 @@
     };
     rpi-firmware-nonfree-src = {
       flake = false;
-      url = "github:RPi-Distro/firmware-nonfree/223ccf3a3ddb11b3ea829749fbbba4d65b380897"; # 1:20230625-2+rpt2
+      url = "github:RPi-Distro/firmware-nonfree/bookworm";
     };
     rpi-bluez-firmware-src = {
       flake = false;
-      url = "github:RPi-Distro/bluez-firmware/78d6a07730e2d20c035899521ab67726dc028e1c"; # 1.2-9+rpt3
+      url = "github:RPi-Distro/bluez-firmware/bookworm";
     };
     libcamera-apps-src = {
       flake = false;
-      url = "github:raspberrypi/libcamera-apps/v1.5.0";
+      url = "github:raspberrypi/rpicam-apps/v1.5.0";
     };
     libcamera-src = {
       flake = false;
diff --git a/overlays/default.nix b/overlays/default.nix
index 7eac593..d65548c 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -70,6 +70,11 @@ let
   rpi-kernels = builtins.foldl' (b: a: b // rpi-kernel a) { };
 in
 {
+  # disable firmware compression so that brcm firmware can be found at
+  # the path expected by raspberry pi firmware/device tree
+  compressFirmwareXz = x: x;
+  compressFirmwareZstd = x: x;
+
   # provide generic rpi arm64 u-boot
   uboot_rpi_arm64 = prev.buildUBoot rec {
     defconfig = "rpi_arm64_defconfig";
diff --git a/overlays/libcamera.nix b/overlays/libcamera.nix
index 281979e..9758808 100644
--- a/overlays/libcamera.nix
+++ b/overlays/libcamera.nix
@@ -11,7 +11,7 @@ final: prev:
 
   libpisp = final.stdenv.mkDerivation {
     name = "libpisp";
-    version = "1.0.5";
+    version = "1.0.6";
     src = libpisp-src;
     nativeBuildInputs = with final; [ pkg-config meson ninja ];
     buildInputs = with final; [ nlohmann_json boost ];