diff --git a/boards/boards_legacy/arm/olimex_stm32_h407/Kconfig.defconfig b/boards/boards_legacy/arm/olimex_stm32_h407/Kconfig.defconfig
deleted file mode 100644
index 01a8e749d59..00000000000
--- a/boards/boards_legacy/arm/olimex_stm32_h407/Kconfig.defconfig
+++ /dev/null
@@ -1,11 +0,0 @@
-# OLIMEX-STM32-H407 board configuration
-
-# Copyright (c) 2018, Reto Schneider <code@reto-schneider.ch>
-# SPDX-License-Identifier: Apache-2.0
-
-if BOARD_OLIMEX_STM32_H407
-
-config BOARD
-	default "olimex_stm32_h407"
-
-endif # BOARD_OLIMEX_STM32_H407
diff --git a/boards/boards_legacy/arm/olimex_stm32_h407/Kconfig.board b/boards/olimex/olimex_stm32_h407/Kconfig.olimex_stm32_h407
similarity index 53%
rename from boards/boards_legacy/arm/olimex_stm32_h407/Kconfig.board
rename to boards/olimex/olimex_stm32_h407/Kconfig.olimex_stm32_h407
index c08552cd65b..12c96366272 100644
--- a/boards/boards_legacy/arm/olimex_stm32_h407/Kconfig.board
+++ b/boards/olimex/olimex_stm32_h407/Kconfig.olimex_stm32_h407
@@ -1,8 +1,5 @@
-# OLIMEX-STM32-H407 board configuration
-
 # Copyright (c) 2018, Reto Schneider <code@reto-schneider.ch>
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_OLIMEX_STM32_H407
-	bool "OLIMEX-STM32-H407 Development Board"
-	depends on SOC_STM32F407XG
+	select SOC_STM32F407XG
diff --git a/boards/boards_legacy/arm/olimex_stm32_h407/board.cmake b/boards/olimex/olimex_stm32_h407/board.cmake
similarity index 100%
rename from boards/boards_legacy/arm/olimex_stm32_h407/board.cmake
rename to boards/olimex/olimex_stm32_h407/board.cmake
diff --git a/boards/olimex/olimex_stm32_h407/board.yml b/boards/olimex/olimex_stm32_h407/board.yml
new file mode 100644
index 00000000000..5d2f0d7a783
--- /dev/null
+++ b/boards/olimex/olimex_stm32_h407/board.yml
@@ -0,0 +1,5 @@
+board:
+  name: olimex_stm32_h407
+  vendor: olimex
+  socs:
+    - name: stm32f407xx
diff --git a/boards/boards_legacy/arm/olimex_stm32_h407/doc/img/olimex-stm32-h407-front.jpg b/boards/olimex/olimex_stm32_h407/doc/img/olimex-stm32-h407-front.jpg
similarity index 100%
rename from boards/boards_legacy/arm/olimex_stm32_h407/doc/img/olimex-stm32-h407-front.jpg
rename to boards/olimex/olimex_stm32_h407/doc/img/olimex-stm32-h407-front.jpg
diff --git a/boards/boards_legacy/arm/olimex_stm32_h407/doc/img/olimex_stm32_h407.jpg b/boards/olimex/olimex_stm32_h407/doc/img/olimex_stm32_h407.jpg
similarity index 100%
rename from boards/boards_legacy/arm/olimex_stm32_h407/doc/img/olimex_stm32_h407.jpg
rename to boards/olimex/olimex_stm32_h407/doc/img/olimex_stm32_h407.jpg
diff --git a/boards/boards_legacy/arm/olimex_stm32_h407/doc/index.rst b/boards/olimex/olimex_stm32_h407/doc/index.rst
similarity index 100%
rename from boards/boards_legacy/arm/olimex_stm32_h407/doc/index.rst
rename to boards/olimex/olimex_stm32_h407/doc/index.rst
diff --git a/boards/boards_legacy/arm/olimex_stm32_h407/olimex_stm32_h407.dts b/boards/olimex/olimex_stm32_h407/olimex_stm32_h407.dts
similarity index 100%
rename from boards/boards_legacy/arm/olimex_stm32_h407/olimex_stm32_h407.dts
rename to boards/olimex/olimex_stm32_h407/olimex_stm32_h407.dts
diff --git a/boards/boards_legacy/arm/olimex_stm32_h407/olimex_stm32_h407.yaml b/boards/olimex/olimex_stm32_h407/olimex_stm32_h407.yaml
similarity index 100%
rename from boards/boards_legacy/arm/olimex_stm32_h407/olimex_stm32_h407.yaml
rename to boards/olimex/olimex_stm32_h407/olimex_stm32_h407.yaml
diff --git a/boards/boards_legacy/arm/olimex_stm32_h407/olimex_stm32_h407_defconfig b/boards/olimex/olimex_stm32_h407/olimex_stm32_h407_defconfig
similarity index 84%
rename from boards/boards_legacy/arm/olimex_stm32_h407/olimex_stm32_h407_defconfig
rename to boards/olimex/olimex_stm32_h407/olimex_stm32_h407_defconfig
index ad325266c72..c729b83e3d0 100644
--- a/boards/boards_legacy/arm/olimex_stm32_h407/olimex_stm32_h407_defconfig
+++ b/boards/olimex/olimex_stm32_h407/olimex_stm32_h407_defconfig
@@ -1,8 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SOC_SERIES_STM32F4X=y
-CONFIG_SOC_STM32F407XG=y
-
 # Enable MPU
 CONFIG_ARM_MPU=y
 
diff --git a/boards/boards_legacy/arm/olimex_stm32_h407/support/openocd.cfg b/boards/olimex/olimex_stm32_h407/support/openocd.cfg
similarity index 100%
rename from boards/boards_legacy/arm/olimex_stm32_h407/support/openocd.cfg
rename to boards/olimex/olimex_stm32_h407/support/openocd.cfg