diff --git a/build/conf/bblayers.conf b/build/conf/bblayers.conf
index 9c2ee94..361defe 100644
--- a/build/conf/bblayers.conf
+++ b/build/conf/bblayers.conf
@@ -11,6 +11,8 @@ BBLAYERS ?= " \
   /home/yocto/ws/poky/meta-yocto-bsp \
   /home/yocto/ws/layers/meta-arm/meta-arm \
   /home/yocto/ws/layers/meta-arm/meta-arm-toolchain \
+  /home/yocto/ws/layers/meta-devdistro \
+  /home/yocto/ws/layers/meta-openembedded/meta-oe \
   /home/yocto/ws/layers/meta-ti/meta-beagle \
   /home/yocto/ws/layers/meta-ti/meta-ti-bsp \
   /home/yocto/ws/layers/meta-ti/meta-ti-extras \
diff --git a/build/conf/local.conf b/build/conf/local.conf
index f1a2ca9..fa10f15 100644
--- a/build/conf/local.conf
+++ b/build/conf/local.conf
@@ -36,7 +36,9 @@
 #MACHINE ?= "genericx86-64"
 #
 # This sets the default machine to be qemux86-64 if no other machine is selected:
-MACHINE ??= "beagleplay"
+MACHINE = "beagleplay"
+KERNEL_DEVICETREE = "k3-am625-beagleplay.dtb"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
 
 # These are some of the more commonly used values. Looking at the files in the
 # meta/conf/machine directory, or the conf/machine directory of any additional layers
@@ -91,7 +93,7 @@ MACHINE ??= "beagleplay"
 # Ultimately when creating custom policy, people will likely end up subclassing 
 # these defaults.
 #
-DISTRO ?= "poky"
+DISTRO ?= "devdistro"
 # As an example of a subclass there is a "bleeding" edge policy configuration
 # where many versions are set to the absolute latest code from the upstream 
 # source control systems. This is just mentioned here as an example, its not
@@ -147,7 +149,6 @@ DISTRO ?= "poky"
 # meta/classes-recipe/core-image.bbclass for more details.
 # We default to enabling the debugging tweaks.
 EXTRA_IMAGE_FEATURES ?= "debug-tweaks"
-IMAGE_INSTALL:append = " vim apt"
 
 #
 # Additional image features