diff --git a/meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf
index 4ceb81af..c3b028ea 100644
--- a/meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf
@@ -8,6 +8,6 @@ UBOOT_MACHINE = "am65x_evm_r5_defconfig"
 UBOOT_MACHINE:tie-test-builds = ""
 
 UBOOT_CONFIG = ""
-UBOOT_CONFIG:prepend:tie-test-builds = "usbdfu main"
+UBOOT_CONFIG:tie-test-builds = "usbdfu main"
 UBOOT_CONFIG[main] = "am65x_evm_r5_defconfig"
 UBOOT_CONFIG[usbdfu] = "am65x_evm_r5_usbdfu_defconfig"
diff --git a/meta-ti-bsp/conf/machine/j722s-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j722s-evm-k3r5.conf
index 5df4edfe..3cb95142 100644
--- a/meta-ti-bsp/conf/machine/j722s-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/j722s-evm-k3r5.conf
@@ -7,8 +7,8 @@ require conf/machine/include/k3r5.inc
 UBOOT_MACHINE = "j722s_evm_r5_defconfig"
 UBOOT_MACHINE:tie-test-builds = ""
 
-UBOOT_CONFIG = "main"
-UBOOT_CONFIG:prepend:tie-test-builds = "usbdfu "
+UBOOT_CONFIG = ""
+UBOOT_CONFIG:tie-test-builds = "usbdfu main"
 UBOOT_CONFIG[main] = "j722s_evm_r5_defconfig"
 UBOOT_CONFIG[usbdfu] = "j722s_evm_r5_defconfig"