diff --git a/boards/arm64/xenvm/Kconfig.defconfig b/boards/v2/xenvm/Kconfig.defconfig
similarity index 82%
rename from boards/arm64/xenvm/Kconfig.defconfig
rename to boards/v2/xenvm/Kconfig.defconfig
index 2e8d48bc8f6..279d9b8114d 100644
--- a/boards/arm64/xenvm/Kconfig.defconfig
+++ b/boards/v2/xenvm/Kconfig.defconfig
@@ -6,7 +6,4 @@ if BOARD_XENVM
 config BUILD_OUTPUT_BIN
 	default y
 
-config BOARD
-	default "xenvm"
-
 endif # BOARD_XENVM
diff --git a/boards/arm64/xenvm/Kconfig.board b/boards/v2/xenvm/Kconfig.xenvm
similarity index 58%
rename from boards/arm64/xenvm/Kconfig.board
rename to boards/v2/xenvm/Kconfig.xenvm
index a967e98216a..e5393bbf957 100644
--- a/boards/arm64/xenvm/Kconfig.board
+++ b/boards/v2/xenvm/Kconfig.xenvm
@@ -2,6 +2,4 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_XENVM
-	bool "Xen Virtual Machine"
-	depends on SOC_XENVM
-	select ARM64
+	select SOC_XENVM
diff --git a/boards/v2/xenvm/board.yml b/boards/v2/xenvm/board.yml
new file mode 100644
index 00000000000..76a1feb50cc
--- /dev/null
+++ b/boards/v2/xenvm/board.yml
@@ -0,0 +1,7 @@
+board:
+  name: xenvm
+  vendor: Xen
+  socs:
+  - name: xenvm
+    variants:
+    - name: gicv3
diff --git a/boards/arm64/xenvm/doc/index.rst b/boards/v2/xenvm/doc/index.rst
similarity index 96%
rename from boards/arm64/xenvm/doc/index.rst
rename to boards/v2/xenvm/doc/index.rst
index bfeb319aaae..74db255d184 100644
--- a/boards/arm64/xenvm/doc/index.rst
+++ b/boards/v2/xenvm/doc/index.rst
@@ -60,7 +60,7 @@ Depending on the version of the GIC on your hardware, you may choose one of the
 following board configurations:
 
 - ``xenvm_defconfig`` selects GICv2
-- ``xenvm_gicv3_defconfig`` selects GICv3
+- ``xenvm_xenvm_gicv3_defconfig`` selects GICv3
 
 CPU Core type
 -------------
@@ -106,7 +106,7 @@ guest, for example, with the :zephyr:code-sample:`synchronization` sample:
 
 .. code-block::
 
-   $ west build -b xenvm_gicv3 samples/synchronization
+   $ west build -b xenvm//gicv3 samples/synchronization
 
 This will build an image with the synchronization sample app. Next, you need to
 create guest configuration file :code:`zephyr.conf`. There is example:
@@ -120,7 +120,7 @@ create guest configuration file :code:`zephyr.conf`. There is example:
    gic_version="v2"
    on_crash="preserve"
 
-When using ``xenvm_gicv3`` configuration, you need to remove the ``gic_version``
+When using ``xenvm//gicv3`` configuration, you need to remove the ``gic_version``
 parameter or set it to ``"v3"``.
 
 You need to upload both :code:`zephyr.bin` and :code:`zephyr.conf` to your Dom0
diff --git a/boards/arm64/xenvm/xenvm.dts b/boards/v2/xenvm/xenvm.dts
similarity index 100%
rename from boards/arm64/xenvm/xenvm.dts
rename to boards/v2/xenvm/xenvm.dts
diff --git a/boards/arm64/xenvm/xenvm.yaml b/boards/v2/xenvm/xenvm.yaml
similarity index 100%
rename from boards/arm64/xenvm/xenvm.yaml
rename to boards/v2/xenvm/xenvm.yaml
diff --git a/boards/arm64/xenvm/xenvm_defconfig b/boards/v2/xenvm/xenvm_defconfig
similarity index 87%
rename from boards/arm64/xenvm/xenvm_defconfig
rename to boards/v2/xenvm/xenvm_defconfig
index 39e8a20767c..96e394971f0 100644
--- a/boards/arm64/xenvm/xenvm_defconfig
+++ b/boards/v2/xenvm/xenvm_defconfig
@@ -1,6 +1,3 @@
-CONFIG_SOC_XENVM=y
-CONFIG_BOARD_XENVM=y
-
 # Enable UART driver
 CONFIG_SERIAL=y
 
diff --git a/boards/arm64/xenvm/xenvm_gicv3.yaml b/boards/v2/xenvm/xenvm_gicv3.yaml
similarity index 83%
rename from boards/arm64/xenvm/xenvm_gicv3.yaml
rename to boards/v2/xenvm/xenvm_gicv3.yaml
index 91026d183d2..0b507e3e7d1 100644
--- a/boards/arm64/xenvm/xenvm_gicv3.yaml
+++ b/boards/v2/xenvm/xenvm_gicv3.yaml
@@ -1,4 +1,4 @@
-identifier: xenvm_gicv3
+identifier: xenvm//gicv3
 name: ARMv8 Xen Virtual Machine With GICv3
 type: mcu
 arch: arm64
diff --git a/boards/arm64/xenvm/xenvm_gicv3.dts b/boards/v2/xenvm/xenvm_xenvm_gicv3.dts
similarity index 100%
rename from boards/arm64/xenvm/xenvm_gicv3.dts
rename to boards/v2/xenvm/xenvm_xenvm_gicv3.dts
diff --git a/boards/arm64/xenvm/xenvm_gicv3_defconfig b/boards/v2/xenvm/xenvm_xenvm_gicv3_defconfig
similarity index 86%
rename from boards/arm64/xenvm/xenvm_gicv3_defconfig
rename to boards/v2/xenvm/xenvm_xenvm_gicv3_defconfig
index 7b6b9afa888..38885a73413 100644
--- a/boards/arm64/xenvm/xenvm_gicv3_defconfig
+++ b/boards/v2/xenvm/xenvm_xenvm_gicv3_defconfig
@@ -1,6 +1,3 @@
-CONFIG_SOC_XENVM=y
-CONFIG_BOARD_XENVM=y
-
 # Enable UART driver
 CONFIG_SERIAL=y