diff --git a/meta-ohos-blueprints/conf/distro/allscenarios-linux-blueprint-dashboard.conf b/meta-ohos-blueprints/conf/distro/allscenarios-linux-blueprint-dashboard.conf
index fffb5367866b2f37331983fafb77643c23ce2740..ae0eae20ee9647fec30003fb60c69179c5383f60 100644
--- a/meta-ohos-blueprints/conf/distro/allscenarios-linux-blueprint-dashboard.conf
+++ b/meta-ohos-blueprints/conf/distro/allscenarios-linux-blueprint-dashboard.conf
@@ -16,6 +16,13 @@ DISTRO_NAME = "AllScenariOS Dashboard Blueprint Linux Distro"
 # The gateway would run on a stm32mp1-av96 machine.
 hostname_base-files_stm32mp1-av96 = "blueprint-dashboard-gateway"
 
+# With our layer setup we would add any bbappend found from our
+# layers.conf. This means blueprint-specific appends would leak
+# into the package in our main distribution. To avoid this we
+# mask out the blueprint layers in the main distro and unmask
+# them only the blueprint distributions.
+BBMASK = ""
+
 # Avoid build warning(s) for ununsed extra partitions.
 ST_VENDORFS = "0"
 ST_USERFS = "0"
diff --git a/meta-ohos-core/conf/distro/include/allscenarios.inc b/meta-ohos-core/conf/distro/include/allscenarios.inc
index dbfa8d5481be27ae8ade75aec3772817a3378e86..8e3a422baa06cae1f5997dbf677750b3f2ed7430 100644
--- a/meta-ohos-core/conf/distro/include/allscenarios.inc
+++ b/meta-ohos-core/conf/distro/include/allscenarios.inc
@@ -3,3 +3,10 @@
 # SPDX-License-Identifier: Apache-2.0
 
 INHERIT += "ohos-sanity"
+
+# With our layer setup we would add any bbappend found from our
+# layers.conf. This means blueprint-specific appends would leak
+# into the package in our main distribution. To avoid this we
+# mask out the blueprint layers in the main distro and unmask
+# them only the blueprint distributions.
+BBMASK += "meta-ohos/meta-ohos-blueprints/"