diff --git a/meta-ti-foundational/conf/layer.conf b/meta-ti-foundational/conf/layer.conf
index 13d294bf..cee35cbc 100644
--- a/meta-ti-foundational/conf/layer.conf
+++ b/meta-ti-foundational/conf/layer.conf
@@ -32,5 +32,7 @@ LAYERRECOMMENDS_meta-ti-foundational = " \
     cg5317 \
 "
 
+IMAGE_FSTYPES:remove:beaglebadge-ti = " ubifs ubi"
+
 # Generate -src ipks packages for sources to be added to the SDK installer
 require conf/distro/include/arago-source-ipk.inc
diff --git a/meta-ti-foundational/recipes-core/images/tisdk-default-image.bb b/meta-ti-foundational/recipes-core/images/tisdk-default-image.bb
index fa9069fd..a7090249 100644
--- a/meta-ti-foundational/recipes-core/images/tisdk-default-image.bb
+++ b/meta-ti-foundational/recipes-core/images/tisdk-default-image.bb
@@ -11,7 +11,7 @@ IMAGE_INSTALL:append = " \
     resize-rootfs \
 "
 
-IMAGE_INSTALL:append:am62lxx = " mosquitto libmosquitto1 libmosquittopp1 mosquitto-clients mosquitto-dev"
+IMAGE_INSTALL:append:am62lxx-evm = " mosquitto libmosquitto1 libmosquittopp1 mosquitto-clients mosquitto-dev"
 IMAGE_INSTALL:append:am62xx = " ti-gst-plugins-source ti-gst-plugins-dev ti-gst-utils "
 IMAGE_INSTALL:append:am62pxx = " ti-gst-plugins-source ti-gst-plugins-dev ti-gst-utils "
 IMAGE_INSTALL:remove:am62dxx = " packagegroup-arago-graphics"
diff --git a/meta-ti-foundational/recipes-core/packagegroups/packagegroup-arago-addons.bbappend b/meta-ti-foundational/recipes-core/packagegroups/packagegroup-arago-addons.bbappend
index b9848cd4..8c8b6a88 100644
--- a/meta-ti-foundational/recipes-core/packagegroups/packagegroup-arago-addons.bbappend
+++ b/meta-ti-foundational/recipes-core/packagegroups/packagegroup-arago-addons.bbappend
@@ -3,7 +3,7 @@ PR:append = "_tisdk_3"
 DEMOS = ""
 DEMOS:append:am62xx = " ti-apps-launcher"
 DEMOS:append:am62pxx = " ti-apps-launcher"
-DEMOS:append:am62lxx = " ti-lvgl-demo"
+DEMOS:append:am62lxx-evm = " ti-lvgl-demo"
 DEMOS:append:foundational = " ti-apps-launcher"
 DEMOS:append:am62dxx-evm = " ti-librpmsg-dma-example"
 DEMOS:append:am335x-evm = " ti-lvgl-demo"
diff --git a/meta-ti-foundational/recipes-tisdk/tisdk-uenv/tisdk-uenv.bbappend b/meta-ti-foundational/recipes-tisdk/tisdk-uenv/tisdk-uenv.bbappend
index d8e135b9..49f66e54 100644
--- a/meta-ti-foundational/recipes-tisdk/tisdk-uenv/tisdk-uenv.bbappend
+++ b/meta-ti-foundational/recipes-tisdk/tisdk-uenv/tisdk-uenv.bbappend
@@ -8,8 +8,8 @@ SRC_URI:append:am62pxx = "\
     file://uEnv-am62p-display-cluster.txt \
 "
 
-SRC_URI:append:am62lxx = "\
-    file://uEnv-am62l-sk.txt \
+SRC_URI:append:am62lxx-evm = "\
+    file://uEnv-am62l-evm.txt \
 "
 
 do_deploy:j722s:foundational() {
@@ -26,7 +26,7 @@ do_deploy:am62pxx() {
     fi
 }
 
-do_deploy:am62lxx() {
+do_deploy:am62lxx-evm() {
     install -d ${DEPLOYDIR}
     install -m 0644 ${S}/uEnv-am62l-sk.txt ${DEPLOYDIR}/uEnv.txt
 }
diff --git a/meta-ti-foundational/recipes-tisdk/tisdk-uenv/tisdk-uenv/am62lxx-evm/uEnv-am62l-sk.txt b/meta-ti-foundational/recipes-tisdk/tisdk-uenv/tisdk-uenv/am62lxx-evm/uEnv-am62l-evm.txt
similarity index 100%
rename from meta-ti-foundational/recipes-tisdk/tisdk-uenv/tisdk-uenv/am62lxx-evm/uEnv-am62l-sk.txt
rename to meta-ti-foundational/recipes-tisdk/tisdk-uenv/tisdk-uenv/am62lxx-evm/uEnv-am62l-evm.txt