diff --git a/meta-ti-bsp/conf/machine/j721s2-evm.conf b/meta-ti-bsp/conf/machine/j721s2-evm.conf
index f0600f33..5cb28309 100644
--- a/meta-ti-bsp/conf/machine/j721s2-evm.conf
+++ b/meta-ti-bsp/conf/machine/j721s2-evm.conf
@@ -20,7 +20,6 @@ KERNEL_DEVICETREE = " \
     ti/k3-j721s2-common-proc-board.dtb \
     ti/k3-j721s2-evm-gesi-exp-board.dtbo \
     ti/k3-j721s2-evm-pcie1-ep.dtbo \
-    ti/k3-j721s2-evm-ub954.dtbo \
 "
 
 UBOOT_MACHINE = "j721s2_evm_a72_defconfig"
diff --git a/meta-ti-bsp/conf/machine/j784s4-evm.conf b/meta-ti-bsp/conf/machine/j784s4-evm.conf
index 3940a95f..bf53b07c 100644
--- a/meta-ti-bsp/conf/machine/j784s4-evm.conf
+++ b/meta-ti-bsp/conf/machine/j784s4-evm.conf
@@ -13,6 +13,7 @@ KERNEL_DEVICETREE_PREFIX = " \
     ti/k3-j7200-evm-mcspi-loopback \
     ti/k3-j721s2-evm-csi2-ov5640 \
     ti/k3-j721s2-evm-fusion \
+    ti/k3-j721s2-evm-ub954 \
     ti/k3-am69-sk \
     ti/k3-v3link \
 "
@@ -23,7 +24,6 @@ KERNEL_DEVICETREE = " \
     ti/k3-j784s4-evm-quad-port-eth-exp1.dtbo \
     ti/k3-j784s4-evm-usxgmii-exp1-exp2.dtbo \
     ti/k3-j784s4-evm.dtb \
-    ti/k3-j721s2-evm-ub954.dtbo \
 "
 
 UBOOT_MACHINE = "j784s4_evm_a72_defconfig"