diff --git a/meta-facebook/conf/layer.conf b/meta-facebook/conf/layer.conf
index 3e5c15c..af9ff5f 100644
--- a/meta-facebook/conf/layer.conf
+++ b/meta-facebook/conf/layer.conf
@@ -6,5 +6,5 @@
             ${LAYERDIR}/recipes-*/*/*.bbappend"
 
 BBFILE_COLLECTIONS += "facebook-layer"
-BBFILE_PATTERN_facebook-layer = ""
-LAYERSERIES_COMPAT_facebook-layer = "thud warrior"
+BBFILE_PATTERN_facebook-layer := "^${LAYERDIR}/"
+LAYERSERIES_COMPAT_facebook-layer := "thud warrior"
diff --git a/meta-facebook/meta-tiogapass/conf/layer.conf b/meta-facebook/meta-tiogapass/conf/layer.conf
index e0be064..1b01364 100644
--- a/meta-facebook/meta-tiogapass/conf/layer.conf
+++ b/meta-facebook/meta-tiogapass/conf/layer.conf
@@ -6,4 +6,6 @@
             ${LAYERDIR}/recipes-*/*/*.bbappend"
 
 BBFILE_COLLECTIONS += "tiogapass-layer"
-BBFILE_PATTERN_tiogapass-layer = ""
+BBFILE_PATTERN_tiogapass-layer := "^${LAYERDIR}/"
+
+LAYERSERIES_COMPAT_tiogapass-layer := "thud warrior"
\ No newline at end of file