diff --git a/boards/boards_legacy/arm/rak5010_nrf52840/Kconfig.defconfig b/boards/rak/rak5010/Kconfig.defconfig
similarity index 64%
rename from boards/boards_legacy/arm/rak5010_nrf52840/Kconfig.defconfig
rename to boards/rak/rak5010/Kconfig.defconfig
index 2361185f0f7..302f7fecd07 100644
--- a/boards/boards_legacy/arm/rak5010_nrf52840/Kconfig.defconfig
+++ b/boards/rak/rak5010/Kconfig.defconfig
@@ -3,12 +3,9 @@
 # Copyright (c) 2020 Guillaume Paquet <guillaume.paquet@smile.fr>
 # SPDX-License-Identifier: Apache-2.0
 
-if BOARD_RAK5010_NRF52840
-
-config BOARD
-	default "rak5010_nrf52840"
+if BOARD_RAK5010
 
 config BT_CTLR
 	default BT
 
-endif # BOARD_RAK5010_NRF52840
+endif # BOARD_RAK5010
diff --git a/boards/boards_legacy/arm/rak5010_nrf52840/Kconfig.board b/boards/rak/rak5010/Kconfig.rak5010
similarity index 74%
rename from boards/boards_legacy/arm/rak5010_nrf52840/Kconfig.board
rename to boards/rak/rak5010/Kconfig.rak5010
index c5a5ab2d3a1..46ce9b4ba8f 100644
--- a/boards/boards_legacy/arm/rak5010_nrf52840/Kconfig.board
+++ b/boards/rak/rak5010/Kconfig.rak5010
@@ -4,5 +4,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_RAK5010_NRF52840
-	bool "RAK5010 DK NRF52840"
-	depends on SOC_NRF52840_QIAA
+	bool
+	default y
+	select SOC_NRF52840_QIAA
diff --git a/boards/boards_legacy/arm/rak5010_nrf52840/board.cmake b/boards/rak/rak5010/board.cmake
similarity index 100%
rename from boards/boards_legacy/arm/rak5010_nrf52840/board.cmake
rename to boards/rak/rak5010/board.cmake
diff --git a/boards/rak/rak5010/board.yml b/boards/rak/rak5010/board.yml
new file mode 100644
index 00000000000..3fcca1c8221
--- /dev/null
+++ b/boards/rak/rak5010/board.yml
@@ -0,0 +1,5 @@
+board:
+  name: rak5010
+  vendor: RAKwireless
+  socs:
+  - name: nrf52840
diff --git a/boards/boards_legacy/arm/rak5010_nrf52840/doc/img/rak5010-front-parts.jpg b/boards/rak/rak5010/doc/img/rak5010-front-parts.jpg
similarity index 100%
rename from boards/boards_legacy/arm/rak5010_nrf52840/doc/img/rak5010-front-parts.jpg
rename to boards/rak/rak5010/doc/img/rak5010-front-parts.jpg
diff --git a/boards/boards_legacy/arm/rak5010_nrf52840/doc/index.rst b/boards/rak/rak5010/doc/index.rst
similarity index 97%
rename from boards/boards_legacy/arm/rak5010_nrf52840/doc/index.rst
rename to boards/rak/rak5010/doc/index.rst
index 9ca09035d00..fac00cf72df 100644
--- a/boards/boards_legacy/arm/rak5010_nrf52840/doc/index.rst
+++ b/boards/rak/rak5010/doc/index.rst
@@ -48,7 +48,7 @@ Hardware
 Supported Features
 ==================
 
-The rak5010_nrf52840 board configuration supports the following hardware features:
+The ``rak5010/nrf52840`` board configuration supports the following hardware features:
 
 +-----------+------------+----------------------+
 | Interface | Controller | Driver/Component     |
@@ -130,7 +130,7 @@ Flashing
 
    .. zephyr-app-commands::
       :zephyr-app: samples/hello_world
-      :board: rak5010_nrf52840
+      :board: rak5010/nrf52840
       :goals: build flash
 
    You should see "Hello World! rak5010_nrf52840" in your terminal.
@@ -143,7 +143,7 @@ You can debug an application in the usual way.  Here is an example for the
 
 .. zephyr-app-commands::
    :zephyr-app: samples/hello_world
-   :board: rak5010_nrf52840
+   :board: rak5010/nrf52840
    :maybe-skip-config:
    :goals: debug
 
diff --git a/boards/boards_legacy/arm/rak5010_nrf52840/pre_dt_board.cmake b/boards/rak/rak5010/pre_dt_board.cmake
similarity index 100%
rename from boards/boards_legacy/arm/rak5010_nrf52840/pre_dt_board.cmake
rename to boards/rak/rak5010/pre_dt_board.cmake
diff --git a/boards/boards_legacy/arm/rak5010_nrf52840/rak5010_nrf52840-pinctrl.dtsi b/boards/rak/rak5010/rak5010_nrf52840-pinctrl.dtsi
similarity index 100%
rename from boards/boards_legacy/arm/rak5010_nrf52840/rak5010_nrf52840-pinctrl.dtsi
rename to boards/rak/rak5010/rak5010_nrf52840-pinctrl.dtsi
diff --git a/boards/boards_legacy/arm/rak5010_nrf52840/rak5010_nrf52840.dts b/boards/rak/rak5010/rak5010_nrf52840.dts
similarity index 100%
rename from boards/boards_legacy/arm/rak5010_nrf52840/rak5010_nrf52840.dts
rename to boards/rak/rak5010/rak5010_nrf52840.dts
diff --git a/boards/boards_legacy/arm/rak5010_nrf52840/rak5010_nrf52840.yaml b/boards/rak/rak5010/rak5010_nrf52840.yaml
similarity index 88%
rename from boards/boards_legacy/arm/rak5010_nrf52840/rak5010_nrf52840.yaml
rename to boards/rak/rak5010/rak5010_nrf52840.yaml
index 1238add9d37..21b8e122970 100644
--- a/boards/boards_legacy/arm/rak5010_nrf52840/rak5010_nrf52840.yaml
+++ b/boards/rak/rak5010/rak5010_nrf52840.yaml
@@ -1,4 +1,4 @@
-identifier: rak5010_nrf52840
+identifier: rak5010/nrf52840
 name: RAK5010-NRF52840
 type: mcu
 arch: arm
diff --git a/boards/boards_legacy/arm/rak5010_nrf52840/rak5010_nrf52840_defconfig b/boards/rak/rak5010/rak5010_nrf52840_defconfig
similarity index 77%
rename from boards/boards_legacy/arm/rak5010_nrf52840/rak5010_nrf52840_defconfig
rename to boards/rak/rak5010/rak5010_nrf52840_defconfig
index b7e873c3f03..8daa29dc473 100644
--- a/boards/boards_legacy/arm/rak5010_nrf52840/rak5010_nrf52840_defconfig
+++ b/boards/rak/rak5010/rak5010_nrf52840_defconfig
@@ -1,7 +1,4 @@
 # SPDX-License-Identifier: Apache-2.0
-CONFIG_SOC_SERIES_NRF52X=y
-CONFIG_SOC_NRF52840_QIAA=y
-CONFIG_BOARD_RAK5010_NRF52840=y
 
 # Enable MPU
 CONFIG_ARM_MPU=y