diff --git a/boards/boards_legacy/arm/olimex_stm32_h405/Kconfig.defconfig b/boards/boards_legacy/arm/olimex_stm32_h405/Kconfig.defconfig
deleted file mode 100644
index bd334c78807..00000000000
--- a/boards/boards_legacy/arm/olimex_stm32_h405/Kconfig.defconfig
+++ /dev/null
@@ -1,11 +0,0 @@
-# OLIMEX-STM32-H405 board configuration
-
-# Copyright (c) 2020, Antony Pavlov <antonynpavlov@gmail.com>
-# SPDX-License-Identifier: Apache-2.0
-
-if BOARD_OLIMEX_STM32_H405
-
-config BOARD
-	default "olimex_stm32_h405"
-
-endif # BOARD_OLIMEX_STM32_H405
diff --git a/boards/boards_legacy/arm/olimex_stm32_h405/Kconfig.board b/boards/olimex/olimex_stm32_h405/Kconfig.olimex_stm32_h405
similarity index 54%
rename from boards/boards_legacy/arm/olimex_stm32_h405/Kconfig.board
rename to boards/olimex/olimex_stm32_h405/Kconfig.olimex_stm32_h405
index 6559afd8b35..14754387e3a 100644
--- a/boards/boards_legacy/arm/olimex_stm32_h405/Kconfig.board
+++ b/boards/olimex/olimex_stm32_h405/Kconfig.olimex_stm32_h405
@@ -1,8 +1,5 @@
-# OLIMEX-STM32-H405 board configuration
-
 # Copyright (c) 2020, 2021 Antony Pavlov <antonynpavlov@gmail.com>
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_OLIMEX_STM32_H405
-	bool "OLIMEX STM32-H405 Development Board"
-	depends on SOC_STM32F405XG
+	select SOC_STM32F405XG
diff --git a/boards/boards_legacy/arm/olimex_stm32_h405/board.cmake b/boards/olimex/olimex_stm32_h405/board.cmake
similarity index 100%
rename from boards/boards_legacy/arm/olimex_stm32_h405/board.cmake
rename to boards/olimex/olimex_stm32_h405/board.cmake
diff --git a/boards/olimex/olimex_stm32_h405/board.yml b/boards/olimex/olimex_stm32_h405/board.yml
new file mode 100644
index 00000000000..bd0e8f4beaa
--- /dev/null
+++ b/boards/olimex/olimex_stm32_h405/board.yml
@@ -0,0 +1,5 @@
+board:
+  name: olimex_stm32_h405
+  vendor: olimex
+  socs:
+    - name: stm32f405xx
diff --git a/boards/boards_legacy/arm/olimex_stm32_h405/doc/index.rst b/boards/olimex/olimex_stm32_h405/doc/index.rst
similarity index 100%
rename from boards/boards_legacy/arm/olimex_stm32_h405/doc/index.rst
rename to boards/olimex/olimex_stm32_h405/doc/index.rst
diff --git a/boards/boards_legacy/arm/olimex_stm32_h405/doc/olimex_stm32_h405_bottom.jpg b/boards/olimex/olimex_stm32_h405/doc/olimex_stm32_h405_bottom.jpg
similarity index 100%
rename from boards/boards_legacy/arm/olimex_stm32_h405/doc/olimex_stm32_h405_bottom.jpg
rename to boards/olimex/olimex_stm32_h405/doc/olimex_stm32_h405_bottom.jpg
diff --git a/boards/boards_legacy/arm/olimex_stm32_h405/doc/olimex_stm32_h405_top.jpg b/boards/olimex/olimex_stm32_h405/doc/olimex_stm32_h405_top.jpg
similarity index 100%
rename from boards/boards_legacy/arm/olimex_stm32_h405/doc/olimex_stm32_h405_top.jpg
rename to boards/olimex/olimex_stm32_h405/doc/olimex_stm32_h405_top.jpg
diff --git a/boards/boards_legacy/arm/olimex_stm32_h405/olimex_stm32_h405.dts b/boards/olimex/olimex_stm32_h405/olimex_stm32_h405.dts
similarity index 100%
rename from boards/boards_legacy/arm/olimex_stm32_h405/olimex_stm32_h405.dts
rename to boards/olimex/olimex_stm32_h405/olimex_stm32_h405.dts
diff --git a/boards/boards_legacy/arm/olimex_stm32_h405/olimex_stm32_h405.yaml b/boards/olimex/olimex_stm32_h405/olimex_stm32_h405.yaml
similarity index 100%
rename from boards/boards_legacy/arm/olimex_stm32_h405/olimex_stm32_h405.yaml
rename to boards/olimex/olimex_stm32_h405/olimex_stm32_h405.yaml
diff --git a/boards/boards_legacy/arm/olimex_stm32_h405/olimex_stm32_h405_defconfig b/boards/olimex/olimex_stm32_h405/olimex_stm32_h405_defconfig
similarity index 84%
rename from boards/boards_legacy/arm/olimex_stm32_h405/olimex_stm32_h405_defconfig
rename to boards/olimex/olimex_stm32_h405/olimex_stm32_h405_defconfig
index ca015a21976..c729b83e3d0 100644
--- a/boards/boards_legacy/arm/olimex_stm32_h405/olimex_stm32_h405_defconfig
+++ b/boards/olimex/olimex_stm32_h405/olimex_stm32_h405_defconfig
@@ -1,8 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SOC_SERIES_STM32F4X=y
-CONFIG_SOC_STM32F405XG=y
-
 # Enable MPU
 CONFIG_ARM_MPU=y
 
diff --git a/boards/boards_legacy/arm/olimex_stm32_h405/support/openocd.cfg b/boards/olimex/olimex_stm32_h405/support/openocd.cfg
similarity index 100%
rename from boards/boards_legacy/arm/olimex_stm32_h405/support/openocd.cfg
rename to boards/olimex/olimex_stm32_h405/support/openocd.cfg