diff --git a/meta-xilinx/meta-xilinx-bsp/conf/machine/include/xilinx-board.inc b/meta-xilinx/meta-xilinx-bsp/conf/machine/include/xilinx-board.inc
index ae209fd..700a2f8 100644
--- a/meta-xilinx/meta-xilinx-bsp/conf/machine/include/xilinx-board.inc
+++ b/meta-xilinx/meta-xilinx-bsp/conf/machine/include/xilinx-board.inc
@@ -5,8 +5,8 @@
 MACHINEOVERRIDES =. "${@['', '${BOARD}${BOARD_VARIANT}:']['${BOARD_VARIANT}' != '']}"
 
 
-SOC_BOARD_ARCH ?= "${BOARD}"
-SOC_BOARDVARIANT_ARCH ?= "${BOARD}${BOARD_VARIANT}"
+BOARD_ARCH ?= "${BOARD}"
+BOARDVARIANT_ARCH ?= "${BOARD}${BOARD_VARIANT}"
 
-PACKAGE_EXTRA_ARCHS_append = " ${SOC_BOARD_ARCH}"
-PACKAGE_EXTRA_ARCHS_append = "${@['', ' ${SOC_BOARDVARIANT_ARCH}'][d.getVar('SOC_BOARDVARIANT_ARCH') != d.getVar('SOC_BOARD_ARCH')]}"
+PACKAGE_EXTRA_ARCHS_append = " ${BOARD_ARCH}"
+PACKAGE_EXTRA_ARCHS_append = "${@['', ' ${BOARDVARIANT_ARCH}'][d.getVar('BOARDVARIANT_ARCH') != d.getVar('BOARD_ARCH')]}"
diff --git a/meta-xilinx/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf b/meta-xilinx/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf
index 045e942..f31c10c 100644
--- a/meta-xilinx/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf
+++ b/meta-xilinx/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf
@@ -5,6 +5,9 @@
 
 require conf/machine/include/soc-zynqmp.inc
 require conf/machine/include/machine-xilinx-default.inc
+require conf/machine/include/xilinx-board.inc
+
+BOARD = "ultra96"
 
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost usbgadget wifi bluetooth mipi"
 
diff --git a/meta-xilinx/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf b/meta-xilinx/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf
index 4c174d2..bbc0688 100644
--- a/meta-xilinx/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf
+++ b/meta-xilinx/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf
@@ -37,7 +37,6 @@
     boot.scr \
 "
 # This machine has a QEMU model, runqemu setup:
-QB_MACHINE = "-M arm-generic-fdt"
 QB_MEM = "-m 8G"
 QB_DEFAULT_KERNEL = "none"
 QB_NETWORK_DEVICE = ""
diff --git a/meta-xilinx/meta-xilinx-bsp/conf/machine/vck190-versal.conf b/meta-xilinx/meta-xilinx-bsp/conf/machine/vck190-versal.conf
index c9813b7..1ab6a1c 100644
--- a/meta-xilinx/meta-xilinx-bsp/conf/machine/vck190-versal.conf
+++ b/meta-xilinx/meta-xilinx-bsp/conf/machine/vck190-versal.conf
@@ -43,7 +43,6 @@
 
 
 # This machine has a QEMU model, runqemu setup:
-QB_MACHINE = "-M arm-generic-fdt"
 QB_MEM = "-m 8G"
 QB_DEFAULT_KERNEL = "none"
 QB_NETWORK_DEVICE = ""
diff --git a/meta-xilinx/meta-xilinx-bsp/conf/machine/versal-generic.conf b/meta-xilinx/meta-xilinx-bsp/conf/machine/versal-generic.conf
index a1a894e..dd6966a 100644
--- a/meta-xilinx/meta-xilinx-bsp/conf/machine/versal-generic.conf
+++ b/meta-xilinx/meta-xilinx-bsp/conf/machine/versal-generic.conf
@@ -5,6 +5,7 @@
 require conf/machine/include/soc-versal.inc
 require conf/machine/include/machine-xilinx-default.inc
 require conf/machine/include/machine-xilinx-qemu.inc
+require conf/machine/include/xilinx-board.inc
 
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
 
@@ -47,7 +48,6 @@
 HDF_MACHINE = "vc-p-a2197-00-versal"
 
 # This machine has a QEMU model, runqemu setup:
-QB_MACHINE = "-M arm-generic-fdt"
 QB_MEM = "-m 8G"
 QB_DEFAULT_KERNEL = "none"
 QB_NETWORK_DEVICE = ""
diff --git a/meta-xilinx/meta-xilinx-bsp/conf/machine/vmk180-versal.conf b/meta-xilinx/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
index baa5e12..e9044ba 100644
--- a/meta-xilinx/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
+++ b/meta-xilinx/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
@@ -35,7 +35,6 @@
 "
 
 # This machine has a QEMU model, runqemu setup:
-QB_MACHINE = "-M arm-generic-fdt"
 QB_MEM = "-m 8G"
 QB_DEFAULT_KERNEL = "none"
 QB_NETWORK_DEVICE = ""
diff --git a/meta-xilinx/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf b/meta-xilinx/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
index dee3797..2c890cf 100644
--- a/meta-xilinx/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
+++ b/meta-xilinx/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
@@ -37,7 +37,6 @@
 		"
 
 # This machine has a QEMU model, runqemu setup:
-QB_MACHINE = "-machine xlnx-zcu102"
 QB_MEM = "-m 4096"
 QB_OPT_APPEND ?= "-nographic -serial mon:stdio -serial null"
 QB_NETWORK_DEVICE = "-net nic -net nic -net nic -net nic,netdev=net0,macaddr=@MAC@"
diff --git a/meta-xilinx/meta-xilinx-bsp/conf/machine/zynq-generic.conf b/meta-xilinx/meta-xilinx-bsp/conf/machine/zynq-generic.conf
index 0f38e32..be0f701 100644
--- a/meta-xilinx/meta-xilinx-bsp/conf/machine/zynq-generic.conf
+++ b/meta-xilinx/meta-xilinx-bsp/conf/machine/zynq-generic.conf
@@ -5,6 +5,7 @@
 require conf/machine/include/soc-zynq.inc
 require conf/machine/include/machine-xilinx-default.inc
 require conf/machine/include/machine-xilinx-qemu.inc
+require conf/machine/include/xilinx-board.inc
 
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost usbgadget"
 
diff --git a/meta-xilinx/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf b/meta-xilinx/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf
index 7e8316f..9c7dbe8 100644
--- a/meta-xilinx/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf
+++ b/meta-xilinx/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf
@@ -8,6 +8,7 @@
 require conf/machine/include/soc-zynqmp.inc
 require conf/machine/include/machine-xilinx-default.inc
 require conf/machine/include/machine-xilinx-qemu.inc
+require conf/machine/include/xilinx-board.inc
 
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
 
@@ -46,7 +47,6 @@
 		"
 
 # This machine has a QEMU model, runqemu setup:
-QB_MACHINE = "-machine xlnx-zcu102"
 QB_MEM = "-m 4096"
 QB_OPT_APPEND ?= "-nographic -serial mon:stdio -serial null"
 QB_NETWORK_DEVICE = "-net nic -net nic -net nic -net nic,netdev=net0,macaddr=@MAC@"