diff --git a/boards/boards_legacy/arm/96b_neonkey/96b_neonkey.dts b/boards/96boards/96b_neonkey/96b_neonkey.dts
similarity index 100%
rename from boards/boards_legacy/arm/96b_neonkey/96b_neonkey.dts
rename to boards/96boards/96b_neonkey/96b_neonkey.dts
diff --git a/boards/boards_legacy/arm/96b_neonkey/96b_neonkey.yaml b/boards/96boards/96b_neonkey/96b_neonkey.yaml
similarity index 100%
rename from boards/boards_legacy/arm/96b_neonkey/96b_neonkey.yaml
rename to boards/96boards/96b_neonkey/96b_neonkey.yaml
diff --git a/boards/boards_legacy/arm/96b_neonkey/96b_neonkey_defconfig b/boards/96boards/96b_neonkey/96b_neonkey_defconfig
similarity index 85%
rename from boards/boards_legacy/arm/96b_neonkey/96b_neonkey_defconfig
rename to boards/96boards/96b_neonkey/96b_neonkey_defconfig
index 1b51c0cc14a..82ee7285d52 100644
--- a/boards/boards_legacy/arm/96b_neonkey/96b_neonkey_defconfig
+++ b/boards/96boards/96b_neonkey/96b_neonkey_defconfig
@@ -1,8 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SOC_SERIES_STM32F4X=y
-CONFIG_SOC_STM32F411XE=y
-
 # Enable MPU
 CONFIG_ARM_MPU=y
 
diff --git a/boards/boards_legacy/arm/96b_neonkey/Kconfig.board b/boards/96boards/96b_neonkey/Kconfig.96b_neonkey
similarity index 51%
rename from boards/boards_legacy/arm/96b_neonkey/Kconfig.board
rename to boards/96boards/96b_neonkey/Kconfig.96b_neonkey
index 2246b448ec9..63d01784688 100644
--- a/boards/boards_legacy/arm/96b_neonkey/Kconfig.board
+++ b/boards/96boards/96b_neonkey/Kconfig.96b_neonkey
@@ -1,8 +1,5 @@
-# 96Boards Neonkey Board Configuration
-
 # Copyright (c) 2017 Linaro Limited
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_96B_NEONKEY
-	bool "96Boards Neonkey"
-	depends on SOC_STM32F411XE
+	select SOC_STM32F411XE
diff --git a/boards/boards_legacy/arm/96b_neonkey/Kconfig.defconfig b/boards/96boards/96b_neonkey/Kconfig.defconfig
similarity index 85%
rename from boards/boards_legacy/arm/96b_neonkey/Kconfig.defconfig
rename to boards/96boards/96b_neonkey/Kconfig.defconfig
index 54371886f73..ac39b66107e 100644
--- a/boards/boards_legacy/arm/96b_neonkey/Kconfig.defconfig
+++ b/boards/96boards/96b_neonkey/Kconfig.defconfig
@@ -5,9 +5,6 @@
 
 if BOARD_96B_NEONKEY
 
-config BOARD
-	default "96b_neonkey"
-
 config SPI_STM32_INTERRUPT
 	default y
 	depends on SPI
diff --git a/boards/96boards/96b_neonkey/board.yml b/boards/96boards/96b_neonkey/board.yml
new file mode 100644
index 00000000000..214cdc883bb
--- /dev/null
+++ b/boards/96boards/96b_neonkey/board.yml
@@ -0,0 +1,5 @@
+board:
+  name: 96b_neonkey
+  vendor: 96boards
+  socs:
+    - name: stm32f411xe
diff --git a/boards/boards_legacy/arm/96b_neonkey/doc/img/96b_neonkey.jpg b/boards/96boards/96b_neonkey/doc/img/96b_neonkey.jpg
similarity index 100%
rename from boards/boards_legacy/arm/96b_neonkey/doc/img/96b_neonkey.jpg
rename to boards/96boards/96b_neonkey/doc/img/96b_neonkey.jpg
diff --git a/boards/boards_legacy/arm/96b_neonkey/doc/index.rst b/boards/96boards/96b_neonkey/doc/index.rst
similarity index 100%
rename from boards/boards_legacy/arm/96b_neonkey/doc/index.rst
rename to boards/96boards/96b_neonkey/doc/index.rst