diff --git a/micropython/board/PIMORONI_PICO_PLUS2/mpconfigboard.h b/micropython/board/PIMORONI_PICO_PLUS2/mpconfigboard.h
index 6afd8ec..b641619 100644
--- a/micropython/board/PIMORONI_PICO_PLUS2/mpconfigboard.h
+++ b/micropython/board/PIMORONI_PICO_PLUS2/mpconfigboard.h
@@ -3,6 +3,6 @@
 // Might be defined by mpconfigvariant.cmake
 #define MICROPY_HW_BOARD_NAME                   "Pimoroni Pico Plus 2"
 #endif
-#define MICROPY_HW_FLASH_STORAGE_BYTES          (1024 * 1024 * 15)
+#define MICROPY_HW_FLASH_STORAGE_BYTES          (PICO_FLASH_SIZE_BYTES - (2 * 1024 * 1024))
 
 #define MICROPY_HW_PSRAM_CS_PIN                 PIMORONI_PICO_PLUS2_PSRAM_CS_PIN
diff --git a/micropython/board/PIMORONI_PLASMA2350/mpconfigboard.h b/micropython/board/PIMORONI_PLASMA2350/mpconfigboard.h
index b50654e..9aed816 100644
--- a/micropython/board/PIMORONI_PLASMA2350/mpconfigboard.h
+++ b/micropython/board/PIMORONI_PLASMA2350/mpconfigboard.h
@@ -1,6 +1,6 @@
 // Board and hardware specific configuration
 #define MICROPY_HW_BOARD_NAME                   "Pimoroni Plasma 2350"
-#define MICROPY_HW_FLASH_STORAGE_BYTES          (1024 * 1024 * 7)
+#define MICROPY_HW_FLASH_STORAGE_BYTES          (PICO_FLASH_SIZE_BYTES - (2 * 1024 * 1024))
 
 // I2C0 (non-default)
 #define MICROPY_HW_I2C0_SCL  (PLASMA2350_SDA_PIN)
diff --git a/micropython/board/PIMORONI_TINY2350/mpconfigboard.h b/micropython/board/PIMORONI_TINY2350/mpconfigboard.h
index 9681afc..5acf06f 100644
--- a/micropython/board/PIMORONI_TINY2350/mpconfigboard.h
+++ b/micropython/board/PIMORONI_TINY2350/mpconfigboard.h
@@ -1,6 +1,6 @@
 // Board and hardware specific configuration
 #define MICROPY_HW_BOARD_NAME                   "Pimoroni Tiny 2350"
-#define MICROPY_HW_FLASH_STORAGE_BYTES          (1024 * 1024 * 7)
+#define MICROPY_HW_FLASH_STORAGE_BYTES          (PICO_FLASH_SIZE_BYTES - (2 * 1024 * 1024))
 
 // I2C0 (non-default)
 #define MICROPY_HW_I2C0_SCL  (4)
diff --git a/micropython/board/RPI_PICO2/mpconfigboard.h b/micropython/board/RPI_PICO2/mpconfigboard.h
index 8534e4e..a50d66b 100644
--- a/micropython/board/RPI_PICO2/mpconfigboard.h
+++ b/micropython/board/RPI_PICO2/mpconfigboard.h
@@ -1,3 +1,3 @@
 // Board and hardware specific configuration
 #define MICROPY_HW_BOARD_NAME                   "Raspberry Pi Pico"
-#define MICROPY_HW_FLASH_STORAGE_BYTES          (1408 * 1024)
\ No newline at end of file
+#define MICROPY_HW_FLASH_STORAGE_BYTES          (PICO_FLASH_SIZE_BYTES - 1024 * 1024)
\ No newline at end of file
diff --git a/micropython/board/RPI_PICO2B/mpconfigboard.h b/micropython/board/RPI_PICO2B/mpconfigboard.h
index 8534e4e..a50d66b 100644
--- a/micropython/board/RPI_PICO2B/mpconfigboard.h
+++ b/micropython/board/RPI_PICO2B/mpconfigboard.h
@@ -1,3 +1,3 @@
 // Board and hardware specific configuration
 #define MICROPY_HW_BOARD_NAME                   "Raspberry Pi Pico"
-#define MICROPY_HW_FLASH_STORAGE_BYTES          (1408 * 1024)
\ No newline at end of file
+#define MICROPY_HW_FLASH_STORAGE_BYTES          (PICO_FLASH_SIZE_BYTES - 1024 * 1024)
\ No newline at end of file