diff --git a/meta-beagle/conf/machine/beagley-ai-k3r5.conf b/meta-beagle/conf/machine/beagley-ai-k3r5.conf
index 06c74cf9..2d6948d5 100644
--- a/meta-beagle/conf/machine/beagley-ai-k3r5.conf
+++ b/meta-beagle/conf/machine/beagley-ai-k3r5.conf
@@ -2,10 +2,8 @@
 #@NAME: BeagleY AI (R5F)
 #@DESCRIPTION: Machine configuration for the BeagleY AI (R5F core)
 
-require conf/machine/include/k3r5.inc
+require conf/machine/beagley-ai-ti-k3r5.conf
+
 require conf/machine/include/beagle-bsp.inc
 
-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-ti-k3r5.conf b/meta-beagle/conf/machine/beagley-ai-ti-k3r5.conf
new file mode 100644
index 00000000..eaab2d57
--- /dev/null
+++ b/meta-beagle/conf/machine/beagley-ai-ti-k3r5.conf
@@ -0,0 +1,8 @@
+#@TYPE: Machine
+#@NAME: BeagleY AI (R5F)
+#@DESCRIPTION: Machine configuration for the BeagleY AI (R5F core)
+
+require conf/machine/include/k3r5.inc
+
+UBOOT_MACHINE = "am67a_beagley_ai_r5_defconfig"
+UBOOT_MACHINE:bsp-ti-6_6 = "j722s_evm_r5_defconfig"
diff --git a/meta-beagle/conf/machine/beagley-ai-ti.conf b/meta-beagle/conf/machine/beagley-ai-ti.conf
new file mode 100644
index 00000000..d6d05264
--- /dev/null
+++ b/meta-beagle/conf/machine/beagley-ai-ti.conf
@@ -0,0 +1,15 @@
+#@TYPE: Machine
+#@NAME: BeagleY AI (A53)
+#@DESCRIPTION: Machine configuration for the BeagleY AI board (A53 core)
+
+require conf/machine/include/j722s.inc
+
+UBOOT_MACHINE = "am67a_beagley_ai_a53_defconfig"
+UBOOT_MACHINE:bsp-ti-6_6 = "j722s_evm_a53_config"
+
+KERNEL_DEVICETREE_PREFIX = " \
+    ti/k3-am67a \
+    ti/k3-j722s \
+"
+
+MACHINE_GUI_CLASS = "bigscreen"
diff --git a/meta-beagle/conf/machine/beagley-ai.conf b/meta-beagle/conf/machine/beagley-ai.conf
index d73d0506..d2c68201 100644
--- a/meta-beagle/conf/machine/beagley-ai.conf
+++ b/meta-beagle/conf/machine/beagley-ai.conf
@@ -2,18 +2,11 @@
 #@NAME: BeagleY AI (A53)
 #@DESCRIPTION: Machine configuration for the BeagleY AI board (A53 core)
 
-require conf/machine/include/j722s.inc
+require conf/machine/beagley-ai-ti.conf
+
 require conf/machine/include/beagle-bsp.inc
 
-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 \
-    ti/k3-j722s \
-"
 
 KERNEL_DEVICETREE:bsp-bb_org-6_6 = " \
 ti/k3-am67a-beagley-ai.dtb \