diff --git a/boards/boards_legacy/arm/96b_wistrio/96b_lscon.dtsi b/boards/96boards/96b_wistrio/96b_lscon.dtsi
similarity index 100%
rename from boards/boards_legacy/arm/96b_wistrio/96b_lscon.dtsi
rename to boards/96boards/96b_wistrio/96b_lscon.dtsi
diff --git a/boards/boards_legacy/arm/96b_wistrio/96b_wistrio.dts b/boards/96boards/96b_wistrio/96b_wistrio.dts
similarity index 100%
rename from boards/boards_legacy/arm/96b_wistrio/96b_wistrio.dts
rename to boards/96boards/96b_wistrio/96b_wistrio.dts
diff --git a/boards/boards_legacy/arm/96b_wistrio/96b_wistrio.yaml b/boards/96boards/96b_wistrio/96b_wistrio.yaml
similarity index 100%
rename from boards/boards_legacy/arm/96b_wistrio/96b_wistrio.yaml
rename to boards/96boards/96b_wistrio/96b_wistrio.yaml
diff --git a/boards/boards_legacy/arm/96b_wistrio/96b_wistrio_defconfig b/boards/96boards/96b_wistrio/96b_wistrio_defconfig
similarity index 83%
rename from boards/boards_legacy/arm/96b_wistrio/96b_wistrio_defconfig
rename to boards/96boards/96b_wistrio/96b_wistrio_defconfig
index 9520805e917..23d51e28afa 100644
--- a/boards/boards_legacy/arm/96b_wistrio/96b_wistrio_defconfig
+++ b/boards/96boards/96b_wistrio/96b_wistrio_defconfig
@@ -1,6 +1,3 @@
-CONFIG_SOC_SERIES_STM32L1X=y
-CONFIG_SOC_STM32L151XBA=y
-
 # Enable MPU
 CONFIG_ARM_MPU=y
 
diff --git a/boards/boards_legacy/arm/96b_wistrio/CMakeLists.txt b/boards/96boards/96b_wistrio/CMakeLists.txt
similarity index 100%
rename from boards/boards_legacy/arm/96b_wistrio/CMakeLists.txt
rename to boards/96boards/96b_wistrio/CMakeLists.txt
diff --git a/boards/96boards/96b_wistrio/Kconfig.96b_wistrio b/boards/96boards/96b_wistrio/Kconfig.96b_wistrio
new file mode 100644
index 00000000000..f66f9ba9b5f
--- /dev/null
+++ b/boards/96boards/96b_wistrio/Kconfig.96b_wistrio
@@ -0,0 +1,5 @@
+# Copyright (c) 2019 Linaro Ltd.
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_96B_WISTRIO
+	select SOC_STM32L151XBA
diff --git a/boards/boards_legacy/arm/96b_wistrio/Kconfig.defconfig b/boards/96boards/96b_wistrio/Kconfig.defconfig
similarity index 84%
rename from boards/boards_legacy/arm/96b_wistrio/Kconfig.defconfig
rename to boards/96boards/96b_wistrio/Kconfig.defconfig
index 0bb9b83220d..751ed00ab7e 100644
--- a/boards/boards_legacy/arm/96b_wistrio/Kconfig.defconfig
+++ b/boards/96boards/96b_wistrio/Kconfig.defconfig
@@ -5,9 +5,6 @@
 
 if BOARD_96B_WISTRIO
 
-config BOARD
-	default "96b_wistrio"
-
 config REGULATOR
 	default y if LORA
 
diff --git a/boards/boards_legacy/arm/96b_wistrio/board.cmake b/boards/96boards/96b_wistrio/board.cmake
similarity index 100%
rename from boards/boards_legacy/arm/96b_wistrio/board.cmake
rename to boards/96boards/96b_wistrio/board.cmake
diff --git a/boards/96boards/96b_wistrio/board.yml b/boards/96boards/96b_wistrio/board.yml
new file mode 100644
index 00000000000..508c590a6b5
--- /dev/null
+++ b/boards/96boards/96b_wistrio/board.yml
@@ -0,0 +1,5 @@
+board:
+  name: 96b_wistrio
+  vendor: 96boards
+  socs:
+    - name: stm32l151xba
diff --git a/boards/boards_legacy/arm/96b_wistrio/doc/96b_wistrio.rst b/boards/96boards/96b_wistrio/doc/96b_wistrio.rst
similarity index 100%
rename from boards/boards_legacy/arm/96b_wistrio/doc/96b_wistrio.rst
rename to boards/96boards/96b_wistrio/doc/96b_wistrio.rst
diff --git a/boards/boards_legacy/arm/96b_wistrio/doc/img/96b-wistrio.jpg b/boards/96boards/96b_wistrio/doc/img/96b-wistrio.jpg
similarity index 100%
rename from boards/boards_legacy/arm/96b_wistrio/doc/img/96b-wistrio.jpg
rename to boards/96boards/96b_wistrio/doc/img/96b-wistrio.jpg
diff --git a/boards/boards_legacy/arm/96b_wistrio/dts/bindings/qorvo,rfsw8001.yaml b/boards/96boards/96b_wistrio/dts/bindings/qorvo,rfsw8001.yaml
similarity index 100%
rename from boards/boards_legacy/arm/96b_wistrio/dts/bindings/qorvo,rfsw8001.yaml
rename to boards/96boards/96b_wistrio/dts/bindings/qorvo,rfsw8001.yaml
diff --git a/boards/boards_legacy/arm/96b_wistrio/rf.c b/boards/96boards/96b_wistrio/rf.c
similarity index 100%
rename from boards/boards_legacy/arm/96b_wistrio/rf.c
rename to boards/96boards/96b_wistrio/rf.c
diff --git a/boards/boards_legacy/arm/96b_wistrio/Kconfig.board b/boards/boards_legacy/arm/96b_wistrio/Kconfig.board
deleted file mode 100644
index ac527a671b7..00000000000
--- a/boards/boards_legacy/arm/96b_wistrio/Kconfig.board
+++ /dev/null
@@ -1,8 +0,0 @@
-# 96boards WisTrio board configuration
-
-# Copyright (c) 2019 Linaro Ltd.
-# SPDX-License-Identifier: Apache-2.0
-
-config BOARD_96B_WISTRIO
-	bool "96boards WisTrio Development Board"
-	depends on SOC_STM32L151XBA