diff --git a/meta-hpe/meta-dl360-g11/conf/templates/default/bblayers.conf.sample b/meta-hpe/meta-dl360-g11/conf/templates/default/bblayers.conf.sample
index 54e9348..00ae83e 100644
--- a/meta-hpe/meta-dl360-g11/conf/templates/default/bblayers.conf.sample
+++ b/meta-hpe/meta-dl360-g11/conf/templates/default/bblayers.conf.sample
@@ -18,16 +18,3 @@
   ##OEROOT##/meta-hpe/meta-gxp \
   ##OEROOT##/meta-hpe/meta-dl360-g11 \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-openembedded/meta-oe \
-  ##OEROOT##/meta-openembedded/meta-networking \
-  ##OEROOT##/meta-openembedded/meta-perl \
-  ##OEROOT##/meta-openembedded/meta-python \
-  ##OEROOT##/meta-openembedded/meta-webserver \
-  ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-hpe \
-  ##OEROOT##/meta-hpe/meta-common \
-  ##OEROOT##/meta-hpe/meta-gxp \
-  ##OEROOT##/meta-hpe/meta-dl360-g11 \
-  "
diff --git a/meta-hpe/meta-dl385-g11/conf/templates/default/bblayers.conf.sample b/meta-hpe/meta-dl385-g11/conf/templates/default/bblayers.conf.sample
index f03cff6..0d6b13f 100644
--- a/meta-hpe/meta-dl385-g11/conf/templates/default/bblayers.conf.sample
+++ b/meta-hpe/meta-dl385-g11/conf/templates/default/bblayers.conf.sample
@@ -18,16 +18,3 @@
   ##OEROOT##/meta-hpe/meta-gxp \
   ##OEROOT##/meta-hpe/meta-dl385-g11 \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-openembedded/meta-oe \
-  ##OEROOT##/meta-openembedded/meta-networking \
-  ##OEROOT##/meta-openembedded/meta-perl \
-  ##OEROOT##/meta-openembedded/meta-python \
-  ##OEROOT##/meta-openembedded/meta-webserver \
-  ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-hpe \
-  ##OEROOT##/meta-hpe/meta-common \
-  ##OEROOT##/meta-hpe/meta-gxp \
-  ##OEROOT##/meta-hpe/meta-dl385-g11 \
-  "