diff --git a/app/boards/seeeduino_xiao_rp2040.conf b/app/boards/xiao_rp2040.conf
similarity index 73%
rename from app/boards/seeeduino_xiao_rp2040.conf
rename to app/boards/xiao_rp2040.conf
index 714e715cc..1f7d85b36 100644
--- a/app/boards/seeeduino_xiao_rp2040.conf
+++ b/app/boards/xiao_rp2040.conf
@@ -9,3 +9,7 @@ CONFIG_SETTINGS_NVS=y
 CONFIG_FLASH=y
 CONFIG_FLASH_PAGE_LAYOUT=y
 CONFIG_FLASH_MAP=y
+
+CONFIG_RETAINED_MEM=y
+CONFIG_RETENTION=y
+CONFIG_RETENTION_BOOT_MODE=y
diff --git a/app/boards/seeeduino_xiao_rp2040.overlay b/app/boards/xiao_rp2040.overlay
similarity index 87%
rename from app/boards/seeeduino_xiao_rp2040.overlay
rename to app/boards/xiao_rp2040.overlay
index e6ba81364..8f2e87143 100644
--- a/app/boards/seeeduino_xiao_rp2040.overlay
+++ b/app/boards/xiao_rp2040.overlay
@@ -4,6 +4,8 @@
  * SPDX-License-Identifier: MIT
  */
 
+#include <arm/raspberrypi/rp2040-boot-mode-retention.dtsi>
+
 &xiao_serial { status = "disabled"; };
 
 &code_partition {