diff --git a/boards/arm/olimexino_stm32/Kconfig.defconfig b/boards/v2/olimex/olimexino_stm32/Kconfig.defconfig
similarity index 85%
rename from boards/arm/olimexino_stm32/Kconfig.defconfig
rename to boards/v2/olimex/olimexino_stm32/Kconfig.defconfig
index 1c90ddc74e2..1f2ff6acf96 100644
--- a/boards/arm/olimexino_stm32/Kconfig.defconfig
+++ b/boards/v2/olimex/olimexino_stm32/Kconfig.defconfig
@@ -5,9 +5,6 @@
 
 if BOARD_OLIMEXINO_STM32
 
-config BOARD
-	default "olimexino_stm32"
-
 config SPI_STM32_INTERRUPT
 	default y
 	depends on SPI
diff --git a/boards/arm/olimexino_stm32/Kconfig.board b/boards/v2/olimex/olimexino_stm32/Kconfig.olimexino_stm32
similarity index 50%
rename from boards/arm/olimexino_stm32/Kconfig.board
rename to boards/v2/olimex/olimexino_stm32/Kconfig.olimexino_stm32
index 902efe68813..523f1c99023 100644
--- a/boards/arm/olimexino_stm32/Kconfig.board
+++ b/boards/v2/olimex/olimexino_stm32/Kconfig.olimexino_stm32
@@ -1,8 +1,5 @@
-# OLIMEXINO-STM32 board configuration
-
 # Copyright (c) 2016, I-SENSE group of ICCS
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_OLIMEXINO_STM32
-	bool "OLIMEXINO-STM32 Development Board"
-	depends on SOC_STM32F103XB
+	select SOC_STM32F103XB
diff --git a/boards/arm/olimexino_stm32/board.cmake b/boards/v2/olimex/olimexino_stm32/board.cmake
similarity index 100%
rename from boards/arm/olimexino_stm32/board.cmake
rename to boards/v2/olimex/olimexino_stm32/board.cmake
diff --git a/boards/v2/olimex/olimexino_stm32/board.yml b/boards/v2/olimex/olimexino_stm32/board.yml
new file mode 100644
index 00000000000..0944c4bb280
--- /dev/null
+++ b/boards/v2/olimex/olimexino_stm32/board.yml
@@ -0,0 +1,5 @@
+board:
+  name: olimexino_stm32
+  vendor: olimex
+  socs:
+    - name: stm32f103xb
diff --git a/boards/arm/olimexino_stm32/doc/img/olimexino-stm32-front.jpg b/boards/v2/olimex/olimexino_stm32/doc/img/olimexino-stm32-front.jpg
similarity index 100%
rename from boards/arm/olimexino_stm32/doc/img/olimexino-stm32-front.jpg
rename to boards/v2/olimex/olimexino_stm32/doc/img/olimexino-stm32-front.jpg
diff --git a/boards/arm/olimexino_stm32/doc/img/olimexino_stm32.jpg b/boards/v2/olimex/olimexino_stm32/doc/img/olimexino_stm32.jpg
similarity index 100%
rename from boards/arm/olimexino_stm32/doc/img/olimexino_stm32.jpg
rename to boards/v2/olimex/olimexino_stm32/doc/img/olimexino_stm32.jpg
diff --git a/boards/arm/olimexino_stm32/doc/index.rst b/boards/v2/olimex/olimexino_stm32/doc/index.rst
similarity index 100%
rename from boards/arm/olimexino_stm32/doc/index.rst
rename to boards/v2/olimex/olimexino_stm32/doc/index.rst
diff --git a/boards/arm/olimexino_stm32/olimexino_stm32.dts b/boards/v2/olimex/olimexino_stm32/olimexino_stm32.dts
similarity index 100%
rename from boards/arm/olimexino_stm32/olimexino_stm32.dts
rename to boards/v2/olimex/olimexino_stm32/olimexino_stm32.dts
diff --git a/boards/arm/olimexino_stm32/olimexino_stm32.yaml b/boards/v2/olimex/olimexino_stm32/olimexino_stm32.yaml
similarity index 100%
rename from boards/arm/olimexino_stm32/olimexino_stm32.yaml
rename to boards/v2/olimex/olimexino_stm32/olimexino_stm32.yaml
diff --git a/boards/arm/olimexino_stm32/olimexino_stm32_defconfig b/boards/v2/olimex/olimexino_stm32/olimexino_stm32_defconfig
similarity index 85%
rename from boards/arm/olimexino_stm32/olimexino_stm32_defconfig
rename to boards/v2/olimex/olimexino_stm32/olimexino_stm32_defconfig
index f8edab4b980..9472e788675 100644
--- a/boards/arm/olimexino_stm32/olimexino_stm32_defconfig
+++ b/boards/v2/olimex/olimexino_stm32/olimexino_stm32_defconfig
@@ -1,8 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SOC_SERIES_STM32F1X=y
-CONFIG_SOC_STM32F103XB=y
-
 # Enable MPU
 CONFIG_ARM_MPU=y
 
diff --git a/boards/arm/olimexino_stm32/support/openocd.cfg b/boards/v2/olimex/olimexino_stm32/support/openocd.cfg
similarity index 100%
rename from boards/arm/olimexino_stm32/support/openocd.cfg
rename to boards/v2/olimex/olimexino_stm32/support/openocd.cfg