diff --git a/app/boards/adafruit_kb2040.conf b/app/boards/adafruit_kb2040.conf
index 21c1893d9..9c394f2c9 100644
--- a/app/boards/adafruit_kb2040.conf
+++ b/app/boards/adafruit_kb2040.conf
@@ -2,3 +2,7 @@ CONFIG_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_UART_CONSOLE=n
 CONFIG_ZMK_USB=y
+
+CONFIG_RETAINED_MEM=y
+CONFIG_RETENTION=y
+CONFIG_RETENTION_BOOT_MODE=y
\ No newline at end of file
diff --git a/app/boards/adafruit_kb2040.overlay b/app/boards/adafruit_kb2040.overlay
index 72b3adcaf..bf3fd17a5 100644
--- a/app/boards/adafruit_kb2040.overlay
+++ b/app/boards/adafruit_kb2040.overlay
@@ -4,4 +4,6 @@
  * SPDX-License-Identifier: MIT
  */
 
+#include <arm/raspberrypi/rp2040-boot-mode-retention.dtsi>
+
 &pro_micro_serial { status = "disabled"; };
diff --git a/app/boards/adafruit_qt_py_rp2040.conf b/app/boards/adafruit_qt_py_rp2040.conf
index 21c1893d9..9c394f2c9 100644
--- a/app/boards/adafruit_qt_py_rp2040.conf
+++ b/app/boards/adafruit_qt_py_rp2040.conf
@@ -2,3 +2,7 @@ CONFIG_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_UART_CONSOLE=n
 CONFIG_ZMK_USB=y
+
+CONFIG_RETAINED_MEM=y
+CONFIG_RETENTION=y
+CONFIG_RETENTION_BOOT_MODE=y
\ No newline at end of file
diff --git a/app/boards/adafruit_qt_py_rp2040.overlay b/app/boards/adafruit_qt_py_rp2040.overlay
index b5d2cdb2f..a68455c4a 100644
--- a/app/boards/adafruit_qt_py_rp2040.overlay
+++ b/app/boards/adafruit_qt_py_rp2040.overlay
@@ -4,4 +4,6 @@
  * SPDX-License-Identifier: MIT
  */
 
+#include <arm/raspberrypi/rp2040-boot-mode-retention.dtsi>
+
 &xiao_serial { status = "disabled"; };
diff --git a/app/boards/boardsource_blok.conf b/app/boards/boardsource_blok.conf
index 21c1893d9..9c394f2c9 100644
--- a/app/boards/boardsource_blok.conf
+++ b/app/boards/boardsource_blok.conf
@@ -2,3 +2,7 @@ CONFIG_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_UART_CONSOLE=n
 CONFIG_ZMK_USB=y
+
+CONFIG_RETAINED_MEM=y
+CONFIG_RETENTION=y
+CONFIG_RETENTION_BOOT_MODE=y
\ No newline at end of file
diff --git a/app/boards/boardsource_blok.overlay b/app/boards/boardsource_blok.overlay
index 72b3adcaf..bf3fd17a5 100644
--- a/app/boards/boardsource_blok.overlay
+++ b/app/boards/boardsource_blok.overlay
@@ -4,4 +4,6 @@
  * SPDX-License-Identifier: MIT
  */
 
+#include <arm/raspberrypi/rp2040-boot-mode-retention.dtsi>
+
 &pro_micro_serial { status = "disabled"; };
diff --git a/app/boards/rpi_pico.conf b/app/boards/rpi_pico.conf
index 286ec25ab..147adc6d7 100644
--- a/app/boards/rpi_pico.conf
+++ b/app/boards/rpi_pico.conf
@@ -9,4 +9,8 @@ CONFIG_NVS=y
 CONFIG_SETTINGS_NVS=y
 CONFIG_FLASH=y
 CONFIG_FLASH_PAGE_LAYOUT=y
-CONFIG_FLASH_MAP=y
\ No newline at end of file
+CONFIG_FLASH_MAP=y
+
+CONFIG_RETAINED_MEM=y
+CONFIG_RETENTION=y
+CONFIG_RETENTION_BOOT_MODE=y
\ No newline at end of file
diff --git a/app/boards/rpi_pico.overlay b/app/boards/rpi_pico.overlay
index 5368ab290..b0aed7610 100644
--- a/app/boards/rpi_pico.overlay
+++ b/app/boards/rpi_pico.overlay
@@ -1,3 +1,4 @@
+#include <arm/raspberrypi/rp2040-boot-mode-retention.dtsi>
 
 &uart0 { status = "disabled"; };
 
diff --git a/app/boards/sparkfun_pro_micro_rp2040.conf b/app/boards/sparkfun_pro_micro_rp2040.conf
index 354d70074..70b90914d 100644
--- a/app/boards/sparkfun_pro_micro_rp2040.conf
+++ b/app/boards/sparkfun_pro_micro_rp2040.conf
@@ -8,4 +8,8 @@ CONFIG_NVS=y
 CONFIG_SETTINGS_NVS=y
 CONFIG_FLASH=y
 CONFIG_FLASH_PAGE_LAYOUT=y
-CONFIG_FLASH_MAP=y
\ No newline at end of file
+CONFIG_FLASH_MAP=y
+
+CONFIG_RETAINED_MEM=y
+CONFIG_RETENTION=y
+CONFIG_RETENTION_BOOT_MODE=y
\ No newline at end of file
diff --git a/app/boards/sparkfun_pro_micro_rp2040.overlay b/app/boards/sparkfun_pro_micro_rp2040.overlay
index 21aa7dff7..ac83d9816 100644
--- a/app/boards/sparkfun_pro_micro_rp2040.overlay
+++ b/app/boards/sparkfun_pro_micro_rp2040.overlay
@@ -4,6 +4,8 @@
  * SPDX-License-Identifier: MIT
  */
 
+#include <arm/raspberrypi/rp2040-boot-mode-retention.dtsi>
+
 &pro_micro_serial { status = "disabled"; };
 
 // We override to 2MB for maximum compatibility