diff --git a/app/boards/joric/nrfmicro/Kconfig.nrfmicro b/app/boards/joric/nrfmicro/Kconfig.nrfmicro
index bd5d31951..38b80a809 100644
--- a/app/boards/joric/nrfmicro/Kconfig.nrfmicro
+++ b/app/boards/joric/nrfmicro/Kconfig.nrfmicro
@@ -7,6 +7,6 @@ config BOARD_NRFMICRO
     select SOC_NRF52840_QIAA if BOARD_NRFMICRO_NRF52840
     select SOC_NRF52840_QIAA if BOARD_NRFMICRO_NRF52840_FLIPPED
     select SOC_NRF52833_QIAA if BOARD_NRFMICRO_NRF52833
-    imply RETAINED_MEM if BOARD_NRFMICRO_NRF52840 || BOARD_NRFMICRO_NRF52840_FLIPPED
-    imply RETENTION if BOARD_NRFMICRO_NRF52840 || BOARD_NRFMICRO_NRF52840_FLIPPED
-    imply RETENTION_BOOT_MODE if BOARD_NRFMICRO_NRF52840 || BOARD_NRFMICRO_NRF52840_FLIPPED
+    imply RETAINED_MEM
+    imply RETENTION
+    imply RETENTION_BOOT_MODE
diff --git a/app/boards/joric/nrfmicro/nrfmicro_nrf52833.dts b/app/boards/joric/nrfmicro/nrfmicro_nrf52833.dts
index 5099701f8..a5cca787c 100644
--- a/app/boards/joric/nrfmicro/nrfmicro_nrf52833.dts
+++ b/app/boards/joric/nrfmicro/nrfmicro_nrf52833.dts
@@ -6,6 +6,8 @@
 
 /dts-v1/;
 #include <nordic/nrf52833_qiaa.dtsi>
+#include <common/nordic/nrf52833_uf2_boot_mode.dtsi>
+
 #include "arduino_pro_micro_pins_52833.dtsi"
 #include "nrfmicro-pinctrl.dtsi"
 
diff --git a/app/dts/common/nordic/nrf52833_uf2_boot_mode.dtsi b/app/dts/common/nordic/nrf52833_uf2_boot_mode.dtsi
new file mode 100644
index 000000000..9087426c0
--- /dev/null
+++ b/app/dts/common/nordic/nrf52833_uf2_boot_mode.dtsi
@@ -0,0 +1,29 @@
+
+&gpregret1 {
+    adafruit_boot_retention: retention@0 {
+        compatible = "zephyr,retention";
+        status = "okay";
+        reg = <0x0 0x1>;
+    };
+};
+
+/ {
+    chosen {
+        zephyr,boot-mode = &boot_retention;
+        zmk,magic-boot-mode = &adafruit_boot_retention;
+    };
+
+    magic_mapper {
+        compatible = "zmk,bootmode-to-magic-mapper";
+        status = "okay";
+
+        #address-cells = <1>;
+        #size-cells = <1>;
+
+        boot_retention: retention@0 {
+            compatible = "zephyr,retention";
+            status = "okay";
+            reg = <0x0 0x1>;
+        };
+    };
+};
\ No newline at end of file
diff --git a/app/src/boot/Kconfig.defaults b/app/src/boot/Kconfig.defaults
index 29e4e9bc4..41816bd86 100644
--- a/app/src/boot/Kconfig.defaults
+++ b/app/src/boot/Kconfig.defaults
@@ -16,7 +16,7 @@ endif
 if ZMK_BOOTMODE_TO_MAGIC_VALUE_MAPPER
 
 choice ZMK_BOOTMODE_MAGIC_VALUE_BOOTLOADER_TYPE
-    default ZMK_BOOTMODE_MAGIC_VALUE_BOOTLOADER_TYPE_ADAFRUIT_NRF52 if SOC_NRF52840
+    default ZMK_BOOTMODE_MAGIC_VALUE_BOOTLOADER_TYPE_ADAFRUIT_NRF52 if SOC_NRF52833 || SOC_NRF52840
 
 endchoice