diff --git a/meta-ti-bsp/conf/machine/beagle-x15.conf b/meta-beagle/conf/machine/beagle-x15.conf
similarity index 94%
rename from meta-ti-bsp/conf/machine/beagle-x15.conf
rename to meta-beagle/conf/machine/beagle-x15.conf
index 6f8c435b..e9ab5d40 100644
--- a/meta-ti-bsp/conf/machine/beagle-x15.conf
+++ b/meta-beagle/conf/machine/beagle-x15.conf
@@ -2,9 +2,8 @@
 #@NAME: BeagleBoard X15
 #@DESCRIPTION: Machine configuration for the BeagleBoard X15
 
-TI_PREFERRED_BSP ?= "bb_org"
-
 require conf/machine/include/am57xx.inc
+require conf/machine/include/beagle-bsp.inc
 
 DT_VENDOR_PREFIX = "ti/omap/"
 DT_VENDOR_PREFIX:bsp-ti-6_1 = ""
diff --git a/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf b/meta-beagle/conf/machine/beaglebone-ai64-k3r5.conf
similarity index 94%
rename from meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf
rename to meta-beagle/conf/machine/beaglebone-ai64-k3r5.conf
index d415a212..95d3abc0 100644
--- a/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf
+++ b/meta-beagle/conf/machine/beaglebone-ai64-k3r5.conf
@@ -2,9 +2,8 @@
 #@NAME: BeagleBone AI-64 (R5F)
 #@DESCRIPTION: Machine configuration for the BeagleBone AI-64 (R5F core)
 
-TI_PREFERRED_BSP ?= "bb_org"
-
 require conf/machine/include/k3r5.inc
+require conf/machine/include/beagle-bsp.inc
 
 SYSFW_SOC = "j721e"
 SYSFW_CONFIG = "evm"
diff --git a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf b/meta-beagle/conf/machine/beaglebone-ai64.conf
similarity index 96%
rename from meta-ti-bsp/conf/machine/beaglebone-ai64.conf
rename to meta-beagle/conf/machine/beaglebone-ai64.conf
index 56e1ed4e..faffd0bb 100644
--- a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
+++ b/meta-beagle/conf/machine/beaglebone-ai64.conf
@@ -2,9 +2,8 @@
 #@NAME: BeagleBone AI-64 (A72)
 #@DESCRIPTION: Machine configuration for the BeagleBone AI-64 board (A72 core)
 
-TI_PREFERRED_BSP ?= "bb_org"
-
 require conf/machine/include/j721e.inc
+require conf/machine/include/beagle-bsp.inc
 
 IMAGE_SR1_1_HS_FS_FILES:bsp-bb_org = ""
 IMAGE_SR2_HS_SE_FILES:bsp-bb_org = ""
diff --git a/meta-ti-bsp/conf/machine/beaglebone.conf b/meta-beagle/conf/machine/beaglebone.conf
similarity index 95%
rename from meta-ti-bsp/conf/machine/beaglebone.conf
rename to meta-beagle/conf/machine/beaglebone.conf
index 0db4d304..6048383b 100644
--- a/meta-ti-bsp/conf/machine/beaglebone.conf
+++ b/meta-beagle/conf/machine/beaglebone.conf
@@ -2,9 +2,8 @@
 #@NAME: BeagleBone machine
 #@DESCRIPTION: Machine configuration for the http://beagleboard.org/bone board
 
-TI_PREFERRED_BSP ?= "bb_org"
-
 require conf/machine/include/ti33x.inc
+require conf/machine/include/beagle-bsp.inc
 
 DT_VENDOR_PREFIX = "ti/omap/"
 DT_VENDOR_PREFIX:bsp-ti-6_1 = ""