diff --git a/firmware-2711/latest/pieeprom-2024-10-21.bin b/firmware-2711/latest/pieeprom-2024-10-21.bin
new file mode 100644
index 0000000..cd02671
Binary files /dev/null and b/firmware-2711/latest/pieeprom-2024-10-21.bin differ
diff --git a/firmware-2711/latest/recovery.bin b/firmware-2711/latest/recovery.bin
index a566c31..61a1378 100644
Binary files a/firmware-2711/latest/recovery.bin and b/firmware-2711/latest/recovery.bin differ
diff --git a/firmware-2711/release-notes.md b/firmware-2711/release-notes.md
index 1cb00d6..0d0a82e 100644
--- a/firmware-2711/release-notes.md
+++ b/firmware-2711/release-notes.md
@@ -1,5 +1,11 @@
 # Raspberry Pi4 bootloader EEPROM release notes
 
+## 2024-10-21: Fix PCIe BAR issue for some switches  (latest)
+
+* Boot-menu improvements
+  Remain in the forced boot mode until the menu is used to select a different
+  boot-mode or reset to the original boot-order.
+
 ## 2024-10-10: Use soft-reset to preseve SDRAM contents after ramoops (latest)
 
 * SD card high-speed/low-voltage mode can only be exited by powercycling.
diff --git a/firmware-2712/latest/pieeprom-2024-10-21.bin b/firmware-2712/latest/pieeprom-2024-10-21.bin
new file mode 100644
index 0000000..5f6b6a7
Binary files /dev/null and b/firmware-2712/latest/pieeprom-2024-10-21.bin differ
diff --git a/firmware-2712/latest/recovery.bin b/firmware-2712/latest/recovery.bin
index 9162345..a7e181a 100644
Binary files a/firmware-2712/latest/recovery.bin and b/firmware-2712/latest/recovery.bin differ
diff --git a/firmware-2712/release-notes.md b/firmware-2712/release-notes.md
index 0893a3e..257763b 100644
--- a/firmware-2712/release-notes.md
+++ b/firmware-2712/release-notes.md
@@ -1,5 +1,13 @@
 # Raspberry Pi5 bootloader EEPROM release notes
 
+## 2024-10-21: Fix PCIe BAR issue for some switches  (latest)
+
+* Fix PCIe BAR setup issue which prevented NVMe boot from working with some PCIe switches
+  See: https://github.com/raspberrypi/firmware/issues/1833
+* Boot-menu improvements
+  Remain in the forced boot mode until the menu is used to select a different
+  boot-mode or reset to the original boot-order.
+
 ## 2024-10-10: Add support to override the boot-mode at power on (latest)
 
 * Introduce a new boot-menu feature where pressing SPACE at power on