diff --git a/boards/boards_legacy/arm/96b_aerocore2/Kconfig.board b/boards/boards_legacy/arm/96b_aerocore2/Kconfig.board
deleted file mode 100644
index 55d8a706d1b..00000000000
--- a/boards/boards_legacy/arm/96b_aerocore2/Kconfig.board
+++ /dev/null
@@ -1,6 +0,0 @@
-#  Copyright (c) 2020 Linaro Limited
-#  SPDX-License-Identifier: Apache-2.0
-
-config BOARD_96B_AEROCORE2
-	bool "96Boards AEROCORE2 (STM32F427)"
-	depends on SOC_STM32F427XX
diff --git a/boards/boards_legacy/arm/96b_aerocore2/Kconfig.defconfig b/boards/boards_legacy/arm/96b_aerocore2/Kconfig.defconfig
deleted file mode 100644
index 02d82f6f25a..00000000000
--- a/boards/boards_legacy/arm/96b_aerocore2/Kconfig.defconfig
+++ /dev/null
@@ -1,9 +0,0 @@
-#  Copyright (c) 2020 Linaro Limited
-#  SPDX-License-Identifier: Apache-2.0
-
-if BOARD_96B_AEROCORE2
-
-config BOARD
-	default "96b_aerocore2"
-
-endif # BOARD_96B_AEROCORE2
diff --git a/boards/boards_legacy/arm/96b_aerocore2/96b_aerocore2.dts b/boards/gumstix/96b_aerocore2/96b_aerocore2.dts
similarity index 100%
rename from boards/boards_legacy/arm/96b_aerocore2/96b_aerocore2.dts
rename to boards/gumstix/96b_aerocore2/96b_aerocore2.dts
diff --git a/boards/boards_legacy/arm/96b_aerocore2/96b_aerocore2.yaml b/boards/gumstix/96b_aerocore2/96b_aerocore2.yaml
similarity index 100%
rename from boards/boards_legacy/arm/96b_aerocore2/96b_aerocore2.yaml
rename to boards/gumstix/96b_aerocore2/96b_aerocore2.yaml
diff --git a/boards/boards_legacy/arm/96b_aerocore2/96b_aerocore2_defconfig b/boards/gumstix/96b_aerocore2/96b_aerocore2_defconfig
similarity index 86%
rename from boards/boards_legacy/arm/96b_aerocore2/96b_aerocore2_defconfig
rename to boards/gumstix/96b_aerocore2/96b_aerocore2_defconfig
index 8cd955fe1cb..490ce68a742 100644
--- a/boards/boards_legacy/arm/96b_aerocore2/96b_aerocore2_defconfig
+++ b/boards/gumstix/96b_aerocore2/96b_aerocore2_defconfig
@@ -1,9 +1,6 @@
 # Copyright (c) 2020 Linaro Limited
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SOC_SERIES_STM32F4X=y
-CONFIG_SOC_STM32F427XX=y
-
 # Enable MPU
 CONFIG_ARM_MPU=y
 
diff --git a/boards/gumstix/96b_aerocore2/Kconfig.96b_aerocore2 b/boards/gumstix/96b_aerocore2/Kconfig.96b_aerocore2
new file mode 100644
index 00000000000..dae093b174b
--- /dev/null
+++ b/boards/gumstix/96b_aerocore2/Kconfig.96b_aerocore2
@@ -0,0 +1,5 @@
+#  Copyright (c) 2020 Linaro Limited
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_96B_AEROCORE2
+	select SOC_STM32F427XX
diff --git a/boards/boards_legacy/arm/96b_aerocore2/board.cmake b/boards/gumstix/96b_aerocore2/board.cmake
similarity index 100%
rename from boards/boards_legacy/arm/96b_aerocore2/board.cmake
rename to boards/gumstix/96b_aerocore2/board.cmake
diff --git a/boards/gumstix/96b_aerocore2/board.yml b/boards/gumstix/96b_aerocore2/board.yml
new file mode 100644
index 00000000000..b154c07da6c
--- /dev/null
+++ b/boards/gumstix/96b_aerocore2/board.yml
@@ -0,0 +1,5 @@
+board:
+  name: 96b_aerocore2
+  vendor: gumstix
+  socs:
+    - name: stm32f427xx
diff --git a/boards/boards_legacy/arm/96b_aerocore2/doc/img/96b_aerocore2.jpg b/boards/gumstix/96b_aerocore2/doc/img/96b_aerocore2.jpg
similarity index 100%
rename from boards/boards_legacy/arm/96b_aerocore2/doc/img/96b_aerocore2.jpg
rename to boards/gumstix/96b_aerocore2/doc/img/96b_aerocore2.jpg
diff --git a/boards/boards_legacy/arm/96b_aerocore2/doc/index.rst b/boards/gumstix/96b_aerocore2/doc/index.rst
similarity index 100%
rename from boards/boards_legacy/arm/96b_aerocore2/doc/index.rst
rename to boards/gumstix/96b_aerocore2/doc/index.rst