diff --git a/boards/sparc/generic_leon3/Kconfig.defconfig b/boards/v2/gaisler/generic_leon3/Kconfig.defconfig
similarity index 86%
rename from boards/sparc/generic_leon3/Kconfig.defconfig
rename to boards/v2/gaisler/generic_leon3/Kconfig.defconfig
index 97a92b57df5..0294060baa5 100644
--- a/boards/sparc/generic_leon3/Kconfig.defconfig
+++ b/boards/v2/gaisler/generic_leon3/Kconfig.defconfig
@@ -4,9 +4,6 @@
 
 if BOARD_GENERIC_LEON3
 
-config BOARD
-	default "generic_leon3"
-
 config SPARC_CASA
 	default n
 
diff --git a/boards/sparc/generic_leon3/Kconfig.board b/boards/v2/gaisler/generic_leon3/Kconfig.generic_leon3
similarity index 68%
rename from boards/sparc/generic_leon3/Kconfig.board
rename to boards/v2/gaisler/generic_leon3/Kconfig.generic_leon3
index 9ba65374a3c..88240708cf0 100644
--- a/boards/sparc/generic_leon3/Kconfig.board
+++ b/boards/v2/gaisler/generic_leon3/Kconfig.generic_leon3
@@ -3,5 +3,4 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_GENERIC_LEON3
-	bool "Generic LEON3 system"
-	depends on SOC_LEON3
+	select SOC_LEON3
diff --git a/boards/sparc/generic_leon3/board.cmake b/boards/v2/gaisler/generic_leon3/board.cmake
similarity index 100%
rename from boards/sparc/generic_leon3/board.cmake
rename to boards/v2/gaisler/generic_leon3/board.cmake
diff --git a/boards/v2/gaisler/generic_leon3/board.yml b/boards/v2/gaisler/generic_leon3/board.yml
new file mode 100644
index 00000000000..1be26f9d5a1
--- /dev/null
+++ b/boards/v2/gaisler/generic_leon3/board.yml
@@ -0,0 +1,5 @@
+board:
+  name: generic_leon3
+  vendor: Gaisler
+  socs:
+  - name: leon3
diff --git a/boards/sparc/generic_leon3/doc/index.rst b/boards/v2/gaisler/generic_leon3/doc/index.rst
similarity index 100%
rename from boards/sparc/generic_leon3/doc/index.rst
rename to boards/v2/gaisler/generic_leon3/doc/index.rst
diff --git a/boards/sparc/generic_leon3/generic_leon3.dts b/boards/v2/gaisler/generic_leon3/generic_leon3.dts
similarity index 100%
rename from boards/sparc/generic_leon3/generic_leon3.dts
rename to boards/v2/gaisler/generic_leon3/generic_leon3.dts
diff --git a/boards/sparc/generic_leon3/generic_leon3.yaml b/boards/v2/gaisler/generic_leon3/generic_leon3.yaml
similarity index 100%
rename from boards/sparc/generic_leon3/generic_leon3.yaml
rename to boards/v2/gaisler/generic_leon3/generic_leon3.yaml
diff --git a/boards/sparc/generic_leon3/generic_leon3_defconfig b/boards/v2/gaisler/generic_leon3/generic_leon3_defconfig
similarity index 72%
rename from boards/sparc/generic_leon3/generic_leon3_defconfig
rename to boards/v2/gaisler/generic_leon3/generic_leon3_defconfig
index 8ec49d62baf..d7eb0842fa7 100644
--- a/boards/sparc/generic_leon3/generic_leon3_defconfig
+++ b/boards/v2/gaisler/generic_leon3/generic_leon3_defconfig
@@ -1,7 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SOC_LEON3=y
-CONFIG_BOARD_GENERIC_LEON3=y
 CONFIG_CONSOLE=y
 CONFIG_SERIAL=y
 CONFIG_UART_CONSOLE=y