diff --git a/app/boards/arm/nrf52840_m2/Kconfig.board b/app/boards/arm/nrf52840_m2/Kconfig.board
deleted file mode 100644
index b2927ff25..000000000
--- a/app/boards/arm/nrf52840_m2/Kconfig.board
+++ /dev/null
@@ -1,9 +0,0 @@
-# Maker Diary nrf52840 M.2 board configuration
-
-# Copyright (c) 2020 The ZMK Contributors
-# SPDX-License-Identifier: MIT
-
-config BOARD_NRF52840_M2
-    bool "nrf52480_m2"
-    depends on SOC_NRF52840_QIAA
-
diff --git a/app/boards/arm/nrf52840_m2/Kconfig b/app/boards/makerdiary/nrf52840_m2/Kconfig
similarity index 100%
rename from app/boards/arm/nrf52840_m2/Kconfig
rename to app/boards/makerdiary/nrf52840_m2/Kconfig
diff --git a/app/boards/arm/nrf52840_m2/Kconfig.defconfig b/app/boards/makerdiary/nrf52840_m2/Kconfig.defconfig
similarity index 85%
rename from app/boards/arm/nrf52840_m2/Kconfig.defconfig
rename to app/boards/makerdiary/nrf52840_m2/Kconfig.defconfig
index a5227fc0a..a7851c3b1 100644
--- a/app/boards/arm/nrf52840_m2/Kconfig.defconfig
+++ b/app/boards/makerdiary/nrf52840_m2/Kconfig.defconfig
@@ -3,9 +3,6 @@
 
 if BOARD_NRF52840_M2
 
-config BOARD
-    default "nrf52480_m2"
-
 if USB_DEVICE_STACK
 
 config USB_NRFX
diff --git a/app/boards/makerdiary/nrf52840_m2/Kconfig.nrf52840_m2 b/app/boards/makerdiary/nrf52840_m2/Kconfig.nrf52840_m2
new file mode 100644
index 000000000..acb746cdc
--- /dev/null
+++ b/app/boards/makerdiary/nrf52840_m2/Kconfig.nrf52840_m2
@@ -0,0 +1,8 @@
+# Copyright (c) 2020 The ZMK Contributors
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_NRF52840_M2
+    select SOC_NRF52840_QIAA
+    imply RETAINED_MEM
+    imply RETENTION
+    imply RETENTION_BOOT_MODE
diff --git a/app/boards/arm/nrf52840_m2/board.cmake b/app/boards/makerdiary/nrf52840_m2/board.cmake
similarity index 100%
rename from app/boards/arm/nrf52840_m2/board.cmake
rename to app/boards/makerdiary/nrf52840_m2/board.cmake
diff --git a/app/boards/makerdiary/nrf52840_m2/board.yml b/app/boards/makerdiary/nrf52840_m2/board.yml
new file mode 100644
index 000000000..a1675e245
--- /dev/null
+++ b/app/boards/makerdiary/nrf52840_m2/board.yml
@@ -0,0 +1,5 @@
+board:
+  name: nrf52840_m2
+  vendor: makerdiary
+  socs:
+    - name: nrf52840
diff --git a/app/boards/arm/nrf52840_m2/nrf52840_m2.dts b/app/boards/makerdiary/nrf52840_m2/nrf52840_m2.dts
similarity index 97%
rename from app/boards/arm/nrf52840_m2/nrf52840_m2.dts
rename to app/boards/makerdiary/nrf52840_m2/nrf52840_m2.dts
index 39569f0b7..f9ffee623 100644
--- a/app/boards/arm/nrf52840_m2/nrf52840_m2.dts
+++ b/app/boards/makerdiary/nrf52840_m2/nrf52840_m2.dts
@@ -6,6 +6,7 @@
 
 /dts-v1/;
 #include <nordic/nrf52840_qiaa.dtsi>
+#include <common/nordic/nrf52840_uf2_boot_mode.dtsi>
 
 / {
     model = "Makerdiary nRF52840 M.2 module";
diff --git a/app/boards/arm/nrf52840_m2/nrf52840_m2.yaml b/app/boards/makerdiary/nrf52840_m2/nrf52840_m2.yaml
similarity index 100%
rename from app/boards/arm/nrf52840_m2/nrf52840_m2.yaml
rename to app/boards/makerdiary/nrf52840_m2/nrf52840_m2.yaml
diff --git a/app/boards/arm/nrf52840_m2/nrf52840_m2.zmk.yml b/app/boards/makerdiary/nrf52840_m2/nrf52840_m2.zmk.yml
similarity index 100%
rename from app/boards/arm/nrf52840_m2/nrf52840_m2.zmk.yml
rename to app/boards/makerdiary/nrf52840_m2/nrf52840_m2.zmk.yml
diff --git a/app/boards/arm/nrf52840_m2/nrf52840_m2_defconfig b/app/boards/makerdiary/nrf52840_m2/nrf52840_m2_defconfig
similarity index 77%
rename from app/boards/arm/nrf52840_m2/nrf52840_m2_defconfig
rename to app/boards/makerdiary/nrf52840_m2/nrf52840_m2_defconfig
index 93eef9e6e..d0b01539e 100644
--- a/app/boards/arm/nrf52840_m2/nrf52840_m2_defconfig
+++ b/app/boards/makerdiary/nrf52840_m2/nrf52840_m2_defconfig
@@ -1,10 +1,6 @@
 # Copyright (c) 2020 The ZMK Contributors
 # SPDX-License-Identifier: MIT
 
-CONFIG_SOC_SERIES_NRF52X=y
-CONFIG_SOC_NRF52840_QIAA=y
-CONFIG_BOARD_NRF52840_M2=y
-
 # Enable MPU
 CONFIG_ARM_MPU=y
 
diff --git a/app/boards/arm/nrf52840_m2/pre_dt_board.cmake b/app/boards/makerdiary/nrf52840_m2/pre_dt_board.cmake
similarity index 100%
rename from app/boards/arm/nrf52840_m2/pre_dt_board.cmake
rename to app/boards/makerdiary/nrf52840_m2/pre_dt_board.cmake