diff --git a/meta-beagle/conf/machine/beaglebadge-ti.conf b/meta-beagle/conf/machine/beaglebadge-ti.conf
index 78525030..5d08f0a1 100644
--- a/meta-beagle/conf/machine/beaglebadge-ti.conf
+++ b/meta-beagle/conf/machine/beaglebadge-ti.conf
@@ -14,8 +14,13 @@ KERNEL_DEVICETREE_PREFIX = " \
     ti/k3-am62l3-badge \
 "
 
+KERNEL_DEVICETREE_PREFIX:bsp-ti-6_18 = " \
+    ti/k3-am62l3-beaglebadge \
+"
+
 KERNEL_DEVICETREE = ""
 
 UBOOT_MACHINE = "am62lx_badge_defconfig"
+UBOOT_MACHINE:bsp-ti-6_18 = "am62lx_beaglebadge_defconfig"
 
 TFA_BOARD = "am62l3-badge"