diff --git a/meta-beagle/conf/machine/beagley-ai-k3r5.conf b/meta-beagle/conf/machine/beagley-ai-k3r5.conf
index 07198f2e..c00c14d1 100644
--- a/meta-beagle/conf/machine/beagley-ai-k3r5.conf
+++ b/meta-beagle/conf/machine/beagley-ai-k3r5.conf
@@ -9,5 +9,7 @@ SYSFW_SOC = "j722s"
 SYSFW_CONFIG = "evm"
 SYSFW_SUFFIX = "hs-fs"
 
-UBOOT_MACHINE = "j722s_evm_r5_defconfig"
-UBOOT_MACHINE:bsp-bb_org-6_12 = "am67a_beagley_ai_r5_defconfig"
+UBOOT_MACHINE = "am67a_beagley_ai_r5_defconfig"
+UBOOT_MACHINE:bsp-bb_org-6_6 = "j722s_evm_r5_defconfig"
+UBOOT_MACHINE:bsp-ti-6_6 = "j722s_evm_r5_defconfig"
+UBOOT_MACHINE:bsp-ti-6_12 = "j722s_evm_r5_defconfig"
diff --git a/meta-beagle/conf/machine/beagley-ai.conf b/meta-beagle/conf/machine/beagley-ai.conf
index 8fbf3cea..d73d0506 100644
--- a/meta-beagle/conf/machine/beagley-ai.conf
+++ b/meta-beagle/conf/machine/beagley-ai.conf
@@ -5,9 +5,10 @@
 require conf/machine/include/j722s.inc
 require conf/machine/include/beagle-bsp.inc
 
-UBOOT_MACHINE:bsp-bb_org-6_6 = "j722s_evm_a53_config"
-
 UBOOT_MACHINE = "am67a_beagley_ai_a53_defconfig"
+UBOOT_MACHINE:bsp-bb_org-6_6 = "j722s_evm_a53_config"
+UBOOT_MACHINE:bsp-ti-6_6 = "j722s_evm_a53_config"
+UBOOT_MACHINE:bsp-ti-6_12 = "j722s_evm_a53_config"
 
 KERNEL_DEVICETREE_PREFIX = " \
     ti/k3-am67a \