diff --git a/ports/zephyr-cp/boards/adafruit/feather_rp2040_zephyr/board.overlay b/ports/zephyr-cp/boards/adafruit/feather_rp2040_zephyr/board.overlay
index f159dfbe29f..71c30f06406 100644
--- a/ports/zephyr-cp/boards/adafruit/feather_rp2040_zephyr/board.overlay
+++ b/ports/zephyr-cp/boards/adafruit/feather_rp2040_zephyr/board.overlay
@@ -17,26 +17,26 @@
 		code_partition: partition@100 {
 			compatible = "zephyr,mapped-partition";
 			label = "code-partition";
-			reg = <0x100 (0x180000 - 0x100)>;
+			reg = <0x100 (0xfe000 - 0x100)>;
 			read-only;
 		};
 
-		nvm_partition: partition@180000 {
+		storage_partition: partition@fe000 {
 			compatible = "zephyr,mapped-partition";
-			label = "nvm";
-			reg = <0x180000 0x800>;
+			label = "storage";
+			reg = <0xfe000 0x1000>;
 		};
 
-		storage_partition: partition@180800 {
+		nvm_partition: partition@ff000 {
 			compatible = "zephyr,mapped-partition";
-			label = "storage";
-			reg = <0x180800 0x800>;
+			label = "nvm";
+			reg = <0xff000 0x1000>;
 		};
 
-		circuitpy_partition: partition@181000 {
+		circuitpy_partition: partition@100000 {
 			compatible = "zephyr,mapped-partition";
 			label = "circuitpy";
-			reg = <0x181000 (DT_SIZE_M(8) - 0x181000)>;
+			reg = <0x100000 (DT_SIZE_M(8) - 0x100000)>;
 		};
 	};
 };
diff --git a/ports/zephyr-cp/boards/raspberrypi/rpi_pico2_w_zephyr/board.overlay b/ports/zephyr-cp/boards/raspberrypi/rpi_pico2_w_zephyr/board.overlay
index c35cb42519a..436cfc83276 100644
--- a/ports/zephyr-cp/boards/raspberrypi/rpi_pico2_w_zephyr/board.overlay
+++ b/ports/zephyr-cp/boards/raspberrypi/rpi_pico2_w_zephyr/board.overlay
@@ -6,20 +6,20 @@
 		code_partition: partition@0 {
 			compatible = "zephyr,mapped-partition";
 			label = "code-partition";
-			reg = <0x0 0x180000>;
+			reg = <0x0 0x17f000>;
 			read-only;
 		};
 
-		nvm_partition: partition@180000 {
+		storage_partition: partition@17f000 {
 			compatible = "zephyr,mapped-partition";
-			label = "nvm";
-			reg = <0x180000 0x800>;
+			label = "storage";
+			reg = <0x17f000 0x1000>;
 		};
 
-		storage_partition: partition@180800 {
+		nvm_partition: partition@180000 {
 			compatible = "zephyr,mapped-partition";
-			label = "storage";
-			reg = <0x180800 0x800>;
+			label = "nvm";
+			reg = <0x180000 0x1000>;
 		};
 
 		circuitpy_partition: partition@181000 {
diff --git a/ports/zephyr-cp/boards/raspberrypi/rpi_pico2_zephyr/board.overlay b/ports/zephyr-cp/boards/raspberrypi/rpi_pico2_zephyr/board.overlay
index c35cb42519a..a8ce944ab8a 100644
--- a/ports/zephyr-cp/boards/raspberrypi/rpi_pico2_zephyr/board.overlay
+++ b/ports/zephyr-cp/boards/raspberrypi/rpi_pico2_zephyr/board.overlay
@@ -6,26 +6,26 @@
 		code_partition: partition@0 {
 			compatible = "zephyr,mapped-partition";
 			label = "code-partition";
-			reg = <0x0 0x180000>;
+			reg = <0x0 0xfe000>;
 			read-only;
 		};
 
-		nvm_partition: partition@180000 {
+		storage_partition: partition@fe000 {
 			compatible = "zephyr,mapped-partition";
-			label = "nvm";
-			reg = <0x180000 0x800>;
+			label = "storage";
+			reg = <0xfe000 0x1000>;
 		};
 
-		storage_partition: partition@180800 {
+		nvm_partition: partition@ff000 {
 			compatible = "zephyr,mapped-partition";
-			label = "storage";
-			reg = <0x180800 0x800>;
+			label = "nvm";
+			reg = <0xff000 0x1000>;
 		};
 
-		circuitpy_partition: partition@181000 {
+		circuitpy_partition: partition@100000 {
 			compatible = "zephyr,mapped-partition";
 			label = "circuitpy";
-			reg = <0x181000 (DT_SIZE_M(4) - 0x181000)>;
+			reg = <0x100000 (DT_SIZE_M(4) - 0x100000)>;
 		};
 	};
 };
diff --git a/ports/zephyr-cp/boards/raspberrypi/rpi_pico_w_zephyr/board.overlay b/ports/zephyr-cp/boards/raspberrypi/rpi_pico_w_zephyr/board.overlay
index 16b3251df5a..3130d8dc5aa 100644
--- a/ports/zephyr-cp/boards/raspberrypi/rpi_pico_w_zephyr/board.overlay
+++ b/ports/zephyr-cp/boards/raspberrypi/rpi_pico_w_zephyr/board.overlay
@@ -17,20 +17,20 @@
 		code_partition: partition@100 {
 			compatible = "zephyr,mapped-partition";
 			label = "code-partition";
-			reg = <0x100 (0x180000 - 0x100)>;
+			reg = <0x100 (0x17f000 - 0x100)>;
 			read-only;
 		};
 
-		nvm_partition: partition@180000 {
+		storage_partition: partition@17f000 {
 			compatible = "zephyr,mapped-partition";
-			label = "nvm";
-			reg = <0x180000 0x800>;
+			label = "storage";
+			reg = <0x17f000 0x1000>;
 		};
 
-		storage_partition: partition@180800 {
+		nvm_partition: partition@180000 {
 			compatible = "zephyr,mapped-partition";
-			label = "storage";
-			reg = <0x180800 0x800>;
+			label = "nvm";
+			reg = <0x180000 0x1000>;
 		};
 
 		circuitpy_partition: partition@181000 {
diff --git a/ports/zephyr-cp/boards/raspberrypi/rpi_pico_zephyr/board.overlay b/ports/zephyr-cp/boards/raspberrypi/rpi_pico_zephyr/board.overlay
index 16b3251df5a..bfd690085a7 100644
--- a/ports/zephyr-cp/boards/raspberrypi/rpi_pico_zephyr/board.overlay
+++ b/ports/zephyr-cp/boards/raspberrypi/rpi_pico_zephyr/board.overlay
@@ -17,26 +17,26 @@
 		code_partition: partition@100 {
 			compatible = "zephyr,mapped-partition";
 			label = "code-partition";
-			reg = <0x100 (0x180000 - 0x100)>;
+			reg = <0x100 (0xfe000 - 0x100)>;
 			read-only;
 		};
 
-		nvm_partition: partition@180000 {
+		storage_partition: partition@fe000 {
 			compatible = "zephyr,mapped-partition";
-			label = "nvm";
-			reg = <0x180000 0x800>;
+			label = "storage";
+			reg = <0xfe000 0x1000>;
 		};
 
-		storage_partition: partition@180800 {
+		nvm_partition: partition@ff000 {
 			compatible = "zephyr,mapped-partition";
-			label = "storage";
-			reg = <0x180800 0x800>;
+			label = "nvm";
+			reg = <0xff000 0x1000>;
 		};
 
-		circuitpy_partition: partition@181000 {
+		circuitpy_partition: partition@100000 {
 			compatible = "zephyr,mapped-partition";
 			label = "circuitpy";
-			reg = <0x181000 (DT_SIZE_M(2) - 0x181000)>;
+			reg = <0x100000 (DT_SIZE_M(2) - 0x100000)>;
 		};
 	};
 };