diff --git a/boards/boards_legacy/arm/nrf52832_mdk/Kconfig b/boards/maker_diary/nrf52832_mdk/Kconfig
similarity index 100%
rename from boards/boards_legacy/arm/nrf52832_mdk/Kconfig
rename to boards/maker_diary/nrf52832_mdk/Kconfig
diff --git a/boards/boards_legacy/arm/nrf52832_mdk/Kconfig.defconfig b/boards/maker_diary/nrf52832_mdk/Kconfig.defconfig
similarity index 83%
rename from boards/boards_legacy/arm/nrf52832_mdk/Kconfig.defconfig
rename to boards/maker_diary/nrf52832_mdk/Kconfig.defconfig
index 0e5c3fd7817..13d65f68be1 100644
--- a/boards/boards_legacy/arm/nrf52832_mdk/Kconfig.defconfig
+++ b/boards/maker_diary/nrf52832_mdk/Kconfig.defconfig
@@ -5,9 +5,6 @@
 
 if BOARD_NRF52832_MDK
 
-config BOARD
-	default "nrf52832_mdk"
-
 config BT_CTLR
 	default BT
 
diff --git a/boards/boards_legacy/arm/nrf52832_mdk/Kconfig.board b/boards/maker_diary/nrf52832_mdk/Kconfig.nrf52832_mdk
similarity index 73%
rename from boards/boards_legacy/arm/nrf52832_mdk/Kconfig.board
rename to boards/maker_diary/nrf52832_mdk/Kconfig.nrf52832_mdk
index 1707bf29216..87fc85bda30 100644
--- a/boards/boards_legacy/arm/nrf52832_mdk/Kconfig.board
+++ b/boards/maker_diary/nrf52832_mdk/Kconfig.nrf52832_mdk
@@ -4,5 +4,4 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_NRF52832_MDK
-	bool "nRF52832-MDK"
-	depends on SOC_NRF52832_QFAA
+	select SOC_NRF52832_QFAA
diff --git a/boards/boards_legacy/arm/nrf52832_mdk/board.cmake b/boards/maker_diary/nrf52832_mdk/board.cmake
similarity index 100%
rename from boards/boards_legacy/arm/nrf52832_mdk/board.cmake
rename to boards/maker_diary/nrf52832_mdk/board.cmake
diff --git a/boards/maker_diary/nrf52832_mdk/board.yml b/boards/maker_diary/nrf52832_mdk/board.yml
new file mode 100644
index 00000000000..1cde1839b9e
--- /dev/null
+++ b/boards/maker_diary/nrf52832_mdk/board.yml
@@ -0,0 +1,3 @@
+board:
+  name: nrf52832_mdk
+  vendor: Maker Diary
diff --git a/boards/boards_legacy/arm/nrf52832_mdk/doc/index.rst b/boards/maker_diary/nrf52832_mdk/doc/index.rst
similarity index 100%
rename from boards/boards_legacy/arm/nrf52832_mdk/doc/index.rst
rename to boards/maker_diary/nrf52832_mdk/doc/index.rst
diff --git a/boards/boards_legacy/arm/nrf52832_mdk/nrf52832_mdk-pinctrl.dtsi b/boards/maker_diary/nrf52832_mdk/nrf52832_mdk-pinctrl.dtsi
similarity index 100%
rename from boards/boards_legacy/arm/nrf52832_mdk/nrf52832_mdk-pinctrl.dtsi
rename to boards/maker_diary/nrf52832_mdk/nrf52832_mdk-pinctrl.dtsi
diff --git a/boards/boards_legacy/arm/nrf52832_mdk/nrf52832_mdk.dts b/boards/maker_diary/nrf52832_mdk/nrf52832_mdk.dts
similarity index 100%
rename from boards/boards_legacy/arm/nrf52832_mdk/nrf52832_mdk.dts
rename to boards/maker_diary/nrf52832_mdk/nrf52832_mdk.dts
diff --git a/boards/boards_legacy/arm/nrf52832_mdk/nrf52832_mdk.yaml b/boards/maker_diary/nrf52832_mdk/nrf52832_mdk.yaml
similarity index 100%
rename from boards/boards_legacy/arm/nrf52832_mdk/nrf52832_mdk.yaml
rename to boards/maker_diary/nrf52832_mdk/nrf52832_mdk.yaml
diff --git a/boards/boards_legacy/arm/nrf52832_mdk/nrf52832_mdk_defconfig b/boards/maker_diary/nrf52832_mdk/nrf52832_mdk_defconfig
similarity index 69%
rename from boards/boards_legacy/arm/nrf52832_mdk/nrf52832_mdk_defconfig
rename to boards/maker_diary/nrf52832_mdk/nrf52832_mdk_defconfig
index 732b02a3610..7167aca850a 100644
--- a/boards/boards_legacy/arm/nrf52832_mdk/nrf52832_mdk_defconfig
+++ b/boards/maker_diary/nrf52832_mdk/nrf52832_mdk_defconfig
@@ -1,9 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SOC_SERIES_NRF52X=y
-CONFIG_SOC_NRF52832_QFAA=y
-CONFIG_BOARD_NRF52832_MDK=y
-
 # Enable MPU
 CONFIG_ARM_MPU=y
 
diff --git a/boards/boards_legacy/arm/nrf52832_mdk/pre_dt_board.cmake b/boards/maker_diary/nrf52832_mdk/pre_dt_board.cmake
similarity index 100%
rename from boards/boards_legacy/arm/nrf52832_mdk/pre_dt_board.cmake
rename to boards/maker_diary/nrf52832_mdk/pre_dt_board.cmake
diff --git a/boards/ruuvi/ruuvi_ruuvitag/board.yml b/boards/ruuvi/ruuvi_ruuvitag/board.yml
index ff81d531840..32a428065f2 100644
--- a/boards/ruuvi/ruuvi_ruuvitag/board.yml
+++ b/boards/ruuvi/ruuvi_ruuvitag/board.yml
@@ -1,3 +1,5 @@
 board:
   name: ruuvi_ruuvitag
   vendor: Ruuvi
+  socs:
+  - name: nrf52832