diff --git a/meta-beagle/conf/machine/beagleplay-ti.conf b/meta-beagle/conf/machine/beagleplay-ti.conf
index ca88fdfb..4e69c819 100644
--- a/meta-beagle/conf/machine/beagleplay-ti.conf
+++ b/meta-beagle/conf/machine/beagleplay-ti.conf
@@ -2,23 +2,10 @@
 #@NAME: BeaglePlay (A53)
 #@DESCRIPTION: Machine configuration for the BeaglePlay board (A53 core)
 
-require conf/machine/include/k3.inc
-require conf/machine/include/mc_k3r5.inc
-
-SOC_FAMILY:append = ":am62xx"
-
-MACHINE_FEATURES += "screen"
+require conf/machine/include/am62xx.inc
 
 SERIAL_CONSOLES = "115200;ttyS2"
 
-require conf/machine/include/mesa-pvr.inc
-PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
-
-TFA_BOARD = "lite"
-TFA_K3_SYSTEM_SUSPEND = "1"
-
-OPTEEMACHINE = "k3-am62x"
-
 UBOOT_MACHINE = "am62x_beagleplay_a53_defconfig"
 
 SPL_BINARY = "tispl.bin_unsigned"