diff --git a/boards/arm/waveshare_open103z/Kconfig.board b/boards/arm/waveshare_open103z/Kconfig.board
deleted file mode 100644
index ea48f05c767..00000000000
--- a/boards/arm/waveshare_open103z/Kconfig.board
+++ /dev/null
@@ -1,8 +0,0 @@
-# Waveshare Open103Z board configuration
-
-# Copyright (c) 2020 Stefano Manni
-# SPDX-License-Identifier: Apache-2.0
-
-config BOARD_WAVESHARE_OPEN103Z
-	bool "Waveshare OPEN103Z Development Board"
-	depends on SOC_STM32F103XE
diff --git a/boards/arm/waveshare_open103z/Kconfig.defconfig b/boards/arm/waveshare_open103z/Kconfig.defconfig
deleted file mode 100644
index 4a2b56b826a..00000000000
--- a/boards/arm/waveshare_open103z/Kconfig.defconfig
+++ /dev/null
@@ -1,11 +0,0 @@
-# Waveshare Open103Z board configuration
-
-# Copyright (c) 2020 Stefano Manni
-# SPDX-License-Identifier: Apache-2.0
-
-if BOARD_WAVESHARE_OPEN103Z
-
-config BOARD
-	default "waveshare_open103z"
-
-endif # BOARD_WAVESHARE_OPEN103Z
diff --git a/boards/index.rst b/boards/index.rst
index ba2ad03e801..577362f7bf9 100644
--- a/boards/index.rst
+++ b/boards/index.rst
@@ -41,4 +41,5 @@ available under :zephyr_file:`doc/templates/board.tmpl`.
    v2/seagate/index.rst
    v2/sparkfun/index.rst
    v2/st/index.rst
+   v2/waveshare/index.rst
    v2/wiznet/index.rst
diff --git a/boards/v2/waveshare/index.rst b/boards/v2/waveshare/index.rst
new file mode 100644
index 00000000000..3cc804c72a8
--- /dev/null
+++ b/boards/v2/waveshare/index.rst
@@ -0,0 +1,10 @@
+.. _boards-st:
+
+STMicroelectronics
+##################
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*
diff --git a/boards/v2/waveshare/waveshare_open103z/Kconfig.waveshare_open103z b/boards/v2/waveshare/waveshare_open103z/Kconfig.waveshare_open103z
new file mode 100644
index 00000000000..ae0e3f3b4b3
--- /dev/null
+++ b/boards/v2/waveshare/waveshare_open103z/Kconfig.waveshare_open103z
@@ -0,0 +1,5 @@
+# Copyright (c) 2020 Stefano Manni
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_WAVESHARE_OPEN103Z
+	select SOC_STM32F103XE
diff --git a/boards/arm/waveshare_open103z/board.cmake b/boards/v2/waveshare/waveshare_open103z/board.cmake
similarity index 100%
rename from boards/arm/waveshare_open103z/board.cmake
rename to boards/v2/waveshare/waveshare_open103z/board.cmake
diff --git a/boards/v2/waveshare/waveshare_open103z/board.yml b/boards/v2/waveshare/waveshare_open103z/board.yml
new file mode 100644
index 00000000000..7504feebf9f
--- /dev/null
+++ b/boards/v2/waveshare/waveshare_open103z/board.yml
@@ -0,0 +1,5 @@
+board:
+  name: waveshare_open103z
+  vendor: waveshare
+  socs:
+    - name: stm32f103xe
diff --git a/boards/arm/waveshare_open103z/doc/img/waveshare_connector.PNG b/boards/v2/waveshare/waveshare_open103z/doc/img/waveshare_connector.PNG
similarity index 100%
rename from boards/arm/waveshare_open103z/doc/img/waveshare_connector.PNG
rename to boards/v2/waveshare/waveshare_open103z/doc/img/waveshare_connector.PNG
diff --git a/boards/arm/waveshare_open103z/doc/img/waveshare_connector_list.PNG b/boards/v2/waveshare/waveshare_open103z/doc/img/waveshare_connector_list.PNG
similarity index 100%
rename from boards/arm/waveshare_open103z/doc/img/waveshare_connector_list.PNG
rename to boards/v2/waveshare/waveshare_open103z/doc/img/waveshare_connector_list.PNG
diff --git a/boards/arm/waveshare_open103z/doc/img/waveshare_open103z.jpg b/boards/v2/waveshare/waveshare_open103z/doc/img/waveshare_open103z.jpg
similarity index 100%
rename from boards/arm/waveshare_open103z/doc/img/waveshare_open103z.jpg
rename to boards/v2/waveshare/waveshare_open103z/doc/img/waveshare_open103z.jpg
diff --git a/boards/arm/waveshare_open103z/doc/index.rst b/boards/v2/waveshare/waveshare_open103z/doc/index.rst
similarity index 100%
rename from boards/arm/waveshare_open103z/doc/index.rst
rename to boards/v2/waveshare/waveshare_open103z/doc/index.rst
diff --git a/boards/arm/waveshare_open103z/support/openocd.cfg b/boards/v2/waveshare/waveshare_open103z/support/openocd.cfg
similarity index 100%
rename from boards/arm/waveshare_open103z/support/openocd.cfg
rename to boards/v2/waveshare/waveshare_open103z/support/openocd.cfg
diff --git a/boards/arm/waveshare_open103z/waveshare_open103z.dts b/boards/v2/waveshare/waveshare_open103z/waveshare_open103z.dts
similarity index 100%
rename from boards/arm/waveshare_open103z/waveshare_open103z.dts
rename to boards/v2/waveshare/waveshare_open103z/waveshare_open103z.dts
diff --git a/boards/arm/waveshare_open103z/waveshare_open103z.yaml b/boards/v2/waveshare/waveshare_open103z/waveshare_open103z.yaml
similarity index 100%
rename from boards/arm/waveshare_open103z/waveshare_open103z.yaml
rename to boards/v2/waveshare/waveshare_open103z/waveshare_open103z.yaml
diff --git a/boards/arm/waveshare_open103z/waveshare_open103z_defconfig b/boards/v2/waveshare/waveshare_open103z/waveshare_open103z_defconfig
similarity index 81%
rename from boards/arm/waveshare_open103z/waveshare_open103z_defconfig
rename to boards/v2/waveshare/waveshare_open103z/waveshare_open103z_defconfig
index 765fc062bd7..9fd4400ac20 100644
--- a/boards/arm/waveshare_open103z/waveshare_open103z_defconfig
+++ b/boards/v2/waveshare/waveshare_open103z/waveshare_open103z_defconfig
@@ -1,8 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SOC_SERIES_STM32F1X=y
-CONFIG_SOC_STM32F103XE=y
-
 # enable uart driver
 CONFIG_SERIAL=y
 # enable console