diff --git a/meta-facebook/conf/layer.conf b/meta-facebook/conf/layer.conf
index a2a42a7..20a8e5c 100644
--- a/meta-facebook/conf/layer.conf
+++ b/meta-facebook/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "facebook-layer"
 BBFILE_PATTERN_facebook-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_facebook-layer := "mickledore nanbield"
+LAYERSERIES_COMPAT_facebook-layer := "nanbield scarthgap"
diff --git a/meta-facebook/meta-bletchley/conf/layer.conf b/meta-facebook/meta-bletchley/conf/layer.conf
index 9dca13c..ff9c4cc 100644
--- a/meta-facebook/meta-bletchley/conf/layer.conf
+++ b/meta-facebook/meta-bletchley/conf/layer.conf
@@ -8,4 +8,4 @@
 BBFILE_COLLECTIONS += "bletchley-layer"
 BBFILE_PATTERN_bletchley-layer := "^${LAYERDIR}/"
 
-LAYERSERIES_COMPAT_bletchley-layer := "mickledore nanbield"
+LAYERSERIES_COMPAT_bletchley-layer := "nanbield scarthgap"
diff --git a/meta-facebook/meta-greatlakes/conf/layer.conf b/meta-facebook/meta-greatlakes/conf/layer.conf
index 0063b35..2c60c14 100644
--- a/meta-facebook/meta-greatlakes/conf/layer.conf
+++ b/meta-facebook/meta-greatlakes/conf/layer.conf
@@ -8,4 +8,4 @@
 BBFILE_COLLECTIONS += "greatlakes-layer"
 BBFILE_PATTERN_greatlakes-layer := "^${LAYERDIR}/"
 
-LAYERSERIES_COMPAT_greatlakes-layer := "mickledore nanbield"
+LAYERSERIES_COMPAT_greatlakes-layer := "nanbield scarthgap"
diff --git a/meta-facebook/meta-tiogapass/conf/layer.conf b/meta-facebook/meta-tiogapass/conf/layer.conf
index 6225586..83a9687 100644
--- a/meta-facebook/meta-tiogapass/conf/layer.conf
+++ b/meta-facebook/meta-tiogapass/conf/layer.conf
@@ -8,4 +8,4 @@
 BBFILE_COLLECTIONS += "tiogapass-layer"
 BBFILE_PATTERN_tiogapass-layer := "^${LAYERDIR}/"
 
-LAYERSERIES_COMPAT_tiogapass-layer := "mickledore nanbield"
+LAYERSERIES_COMPAT_tiogapass-layer := "nanbield scarthgap"
diff --git a/meta-facebook/meta-yosemite4/conf/layer.conf b/meta-facebook/meta-yosemite4/conf/layer.conf
index 237ed30..38ab9a5 100644
--- a/meta-facebook/meta-yosemite4/conf/layer.conf
+++ b/meta-facebook/meta-yosemite4/conf/layer.conf
@@ -8,4 +8,4 @@
 BBFILE_COLLECTIONS += "yosemite4-layer"
 BBFILE_PATTERN_yosemite4-layer := "^${LAYERDIR}/"
 
-LAYERSERIES_COMPAT_yosemite4-layer := "mickledore nanbield"
+LAYERSERIES_COMPAT_yosemite4-layer := "nanbield scarthgap"
diff --git a/meta-facebook/meta-yosemitev2/conf/layer.conf b/meta-facebook/meta-yosemitev2/conf/layer.conf
index 3777494..6be879b 100644
--- a/meta-facebook/meta-yosemitev2/conf/layer.conf
+++ b/meta-facebook/meta-yosemitev2/conf/layer.conf
@@ -8,4 +8,4 @@
 BBFILE_COLLECTIONS += "yosemitev2-layer"
 BBFILE_PATTERN_yosemitev2-layer := "^${LAYERDIR}/"
 
-LAYERSERIES_COMPAT_yosemitev2-layer := "mickledore nanbield"
+LAYERSERIES_COMPAT_yosemitev2-layer := "nanbield scarthgap"