diff --git a/conf/template/bblayers.conf.sample b/conf/template/bblayers.conf.sample
index 9b4ad85..58a5ef7 100644
--- a/conf/template/bblayers.conf.sample
+++ b/conf/template/bblayers.conf.sample
@@ -22,10 +22,11 @@ BBLAYERS =+ "${@'${MANIFEST_PATH_MW_RELEASE}' if os.path.isfile('${MANIFEST_PATH
 
 BBLAYERS =+ "${@'${MANIFEST_PATH_APPLICATION_DEVELOPMENT}' if os.path.isfile('${MANIFEST_PATH_APPLICATION_DEVELOPMENT}/conf/layer.conf') else ''}"
 
+BBLAYERS =+ "${@'${MANIFEST_PATH_STACK_LAYERING_SUPPORT}' if os.path.isfile('${MANIFEST_PATH_STACK_LAYERING_SUPPORT}/conf/layer.conf') else ''}"
+BBLAYERS =+ "${@'${MANIFEST_PATH_RDK_AUXILIARY}' if os.path.isfile('${MANIFEST_PATH_RDK_AUXILIARY}/conf/layer.conf') else ''}"
 BBLAYERS =+ "${@'${MANIFEST_PATH_IMAGE_SUPPORT}' if os.path.isfile('${MANIFEST_PATH_IMAGE_SUPPORT}/conf/layer.conf') else ''}"
 BBLAYERS =+ "${@'${MANIFEST_PATH_OPENEMBEDDED}' if os.path.isfile('${MANIFEST_PATH_OPENEMBEDDED}/conf/layer.conf') else ''}"
 BBLAYERS =+ "${@'${MANIFEST_PATH_POKY}' if os.path.isfile('${MANIFEST_PATH_POKY}/conf/layer.conf') else ''}"
-BBLAYERS =+ "${@'${MANIFEST_PATH_FOUNDATION_RELEASE}' if os.path.isfile('${MANIFEST_PATH_FOUNDATION_RELEASE}/conf/layer.conf') else ''}"
 BBLAYERS =+ "${@'${MANIFEST_PATH_SCRIPTS}' if os.path.isfile('${MANIFEST_PATH_SCRIPTS}/conf/layer.conf') else ''}"
 BBLAYERS =+ "${@'${MANIFEST_PATH_VENDOR_RELEASE}' if os.path.isfile('${MANIFEST_PATH_VENDOR_RELEASE}/conf/layer.conf') else ''}"
 
diff --git a/recipes-core/images/application-test-image.bb b/recipes-core/images/application-test-image.bb
index e562921..e427748 100644
--- a/recipes-core/images/application-test-image.bb
+++ b/recipes-core/images/application-test-image.bb
@@ -2,7 +2,6 @@ SUMMARY = "RDKE Bootable Image with App support"
 
 LICENSE = "MIT"
 IMAGE_INSTALL = " \
-                 packagegroup-foundation-layer \
                  packagegroup-vendor-layer \
                  packagegroup-middleware-generic \
                  packagegroup-application-layer \