diff --git a/meta-xilinx-bsp/conf/machine/vck5000-versal.conf b/meta-xilinx-bsp/conf/machine/vck5000-versal.conf
deleted file mode 100644
index a80788cc5..000000000
--- a/meta-xilinx-bsp/conf/machine/vck5000-versal.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-#@TYPE: Machine
-#@NAME: vck500-versal
-#@DESCRIPTION: Machine configuration for the VCK5000 evaluation board.
-
-# Compatibility with old BOARD value.
-# TODO - Remove these once removed from petalinux bsp
-MACHINEOVERRIDES =. "vck5000:"
-
-#### Preamble
-MACHINEOVERRIDES =. "${@['', 'vck5000-versal:']['vck5000-versal' !='${MACHINE}']}"
-#### Regular settings follow
-
-# Variables that changes based on hw design or board specific requirement must be
-# defined before calling the required inclusion file else pre-expansion value
-# defined in versal-generic.conf will be set.
-
-# Yocto device-tree variables
-YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "versal_cips_0_pspmc_0_psv_sbsauart_0"
-YAML_DT_BOARD_FLAGS ?= "{BOARD template}"
-
-# Yocto arm-trusted-firmware(TF-A) variables
-ATF_CONSOLE_DEFAULT ?= "pl011"
-TFA_BL33_LOAD ?= "0x8000000"
-
-# Yocto PLM variables
-YAML_SERIAL_CONSOLE_STDIN:pn-plm-firmware ?= "versal_cips_0_pspmc_0_psv_sbsauart_0"
-YAML_SERIAL_CONSOLE_STDOUT:pn-plm-firmware ?= "versal_cips_0_pspmc_0_psv_sbsauart_0"
-
-# Yocto KERNEL Variables
-UBOOT_ENTRYPOINT  ?= "0x200000"
-UBOOT_LOADADDRESS ?= "0x200000"
-
-# vck5000-versal Serial Console
-SERIAL_CONSOLES ?= "115200;ttyAMA0"
-YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200"
-
-# Required generic machine inclusion
-# VCK5000 board uses Versal AI Core device hence use soc variant based generic
-# machine inclusion
-require conf/machine/versal-ai-core-generic.conf
-
-# This machine conf file uses vck5000-versal xsa as reference input.
-# User can override with vck5000 custom xsa using HDF_BASE and HDF_PATH variables
-# from local.conf.
-HDF_MACHINE = "vck5000-versal"
-
-#### No additional settings should be after the Postamble
-#### Postamble
-PACKAGE_EXTRA_ARCHS:append = "${@['', 'vck5000_versal']['vck5000-versal' != '${MACHINE}']}"
diff --git a/meta-xilinx-bsp/conf/machine/vhk158-versal.conf b/meta-xilinx-bsp/conf/machine/vhk158-versal.conf
deleted file mode 100644
index 5c0406de3..000000000
--- a/meta-xilinx-bsp/conf/machine/vhk158-versal.conf
+++ /dev/null
@@ -1,52 +0,0 @@
-#@TYPE: Machine
-#@NAME: vhk158-versal
-#@DESCRIPTION: Machine configuration for the VHK158 evaluation board.
-
-#### Preamble
-MACHINEOVERRIDES =. "${@['', 'vhk158-versal:']['vhk158-versal' !='${MACHINE}']}"
-#### Regular settings follow
-
-# Variables that changes based on hw design or board specific requirement must be
-# defined before calling the required inclusion file else pre-expansion value
-# defined in versal-generic.conf will be set.
-
-# Yocto device-tree variables
-YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "versal_cips_0_pspmc_0_psv_sbsauart_0"
-YAML_DT_BOARD_FLAGS ?= "{BOARD versal-vhk158-reva}"
-
-# Yocto arm-trusted-firmware(TF-A) variables
-ATF_CONSOLE_DEFAULT ?= "pl011"
-TFA_BL33_LOAD ?= "0x8000000"
-
-# Yocto PLM variables
-YAML_SERIAL_CONSOLE_STDIN:pn-plm-firmware ?= "versal_cips_0_pspmc_0_psv_sbsauart_0"
-YAML_SERIAL_CONSOLE_STDOUT:pn-plm-firmware ?= "versal_cips_0_pspmc_0_psv_sbsauart_0"
-
-# Yocto KERNEL Variables
-UBOOT_ENTRYPOINT  ?= "0x200000"
-UBOOT_LOADADDRESS ?= "0x200000"
-
-# vhk158-versal Serial Console 
-SERIAL_CONSOLES ?= "115200;ttyAMA0"
-YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200"
-
-# Required generic machine inclusion
-# VHK158 board uses Versal HBM device hence use soc variant based generic
-# machine inclusion
-require conf/machine/versal-hbm-generic.conf
-
-# This machine conf file uses vhk158-versal xsa as reference input.
-# User can override with vhk158 custom xsa using HDF_BASE and HDF_PATH variables
-# from local.conf.
-HDF_MACHINE = "vhk158-versal"
-
-# VHK158 has 32GB memory only but default versal-generic has QB_MEM set to 8G,
-# Since versal-vhk158-reva.dts has 32GB set, we need set same in QB_MEM
-QB_MEM = "-m 32G"
-
-QEMU_HW_DTB_PS =  "${QEMU_HW_DTB_PATH}/board-versal-ps-vhk158.dtb"
-QEMU_HW_DTB_PMC = "${QEMU_HW_DTB_PATH}/board-versal-pmc-virt.dtb"
-
-#### No additional settings should be after the Postamble
-#### Postamble
-PACKAGE_EXTRA_ARCHS:append = "${@['', 'vhk158_versal']['vhk158-versal' != '${MACHINE}']}"
\ No newline at end of file
diff --git a/meta-xilinx-bsp/conf/machine/zcu670-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu670-zynqmp.conf
deleted file mode 100644
index 6b1dd4887..000000000
--- a/meta-xilinx-bsp/conf/machine/zcu670-zynqmp.conf
+++ /dev/null
@@ -1,50 +0,0 @@
-#@TYPE: Machine
-#@NAME: zcu670-zynqmp
-#@DESCRIPTION: Machine configuration for the ZCU670 evaluation board.
-
-#### Preamble
-MACHINEOVERRIDES =. "${@['', 'zcu670-zynqmp:']['zcu670-zynqmp' !='${MACHINE}']}"
-#### Regular settings follow
-
-# Variables that changes based on hw design or board specific requirement must be
-# defined before calling the required inclusion file else pre-expansion value
-# defined in zynqmp-generic.conf will be set.
-
-# Yocto device-tree variables
-YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "psu_uart_0"
-YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "PSU_DDR_0"
-YAML_DT_BOARD_FLAGS ?= "{BOARD zcu670-revb}"
-
-# Yocto arm-trusted-firmware(TF-A) variables
-ATF_CONSOLE_DEFAULT ?= "cadence"
-TFA_BL33_LOAD ?= "0x8000000"
-
-# Yocto PMUFW variables
-YAML_SERIAL_CONSOLE_STDIN:pn-pmu-firmware ?= "psu_uart_0"
-YAML_SERIAL_CONSOLE_STDOUT:pn-pmu-firmware ?= "psu_uart_0"
-
-# Yocto FSBL variables
-YAML_SERIAL_CONSOLE_STDIN:pn-fsbl-firmware ?= "psu_uart_0"
-YAML_SERIAL_CONSOLE_STDOUT:pn-fsbl-firmware ?= "psu_uart_0"
-
-# Yocto KERNEL Variables
-UBOOT_ENTRYPOINT  ?= "0x200000"
-UBOOT_LOADADDRESS ?= "0x200000"
-
-# zcu670-zynqmp Serial Console 
-SERIAL_CONSOLES ?= "115200;ttyPS0"
-YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200"
-
-# Required generic machine inclusion
-# ZCU670 board uses ZynqMP DR device hence use soc variant based generic machine
-# inclusion
-require conf/machine/zynqmp-dr-generic.conf
-
-# This eval board machine conf file uses zcu670-zynqmp xsa as reference input.
-# User can override with zcu670 custom xsa using HDF_BASE and HDF_PATH variables
-# from local.conf.
-HDF_MACHINE = "zcu670-zynqmp"
-
-#### No additional settings should be after the Postamble
-#### Postamble
-PACKAGE_EXTRA_ARCHS:append = "${@['', 'zcu670_zynqmp']['zcu670-zynqmp' != '${MACHINE}']}"