diff --git a/meta-ibm/conf/layer.conf b/meta-ibm/conf/layer.conf
index 7f6d27b..a5a880e 100644
--- a/meta-ibm/conf/layer.conf
+++ b/meta-ibm/conf/layer.conf
@@ -7,7 +7,7 @@
 
 BBFILE_COLLECTIONS += "ibm-layer"
 BBFILE_PATTERN_ibm-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_ibm-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_ibm-layer = "nanbield scarthgap"
 
 # Only bring in meta-openpower bbappend files if meta-openpower is
 # included in the layer
diff --git a/meta-ibm/meta-genesis3/conf/layer.conf b/meta-ibm/meta-genesis3/conf/layer.conf
index ae10060..e228a53 100644
--- a/meta-ibm/meta-genesis3/conf/layer.conf
+++ b/meta-ibm/meta-genesis3/conf/layer.conf
@@ -6,4 +6,4 @@
 
 BBFILE_COLLECTIONS += "genesis3-layer"
 BBFILE_PATTERN_genesis3-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_genesis3-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_genesis3-layer = "nanbield scarthgap"
diff --git a/meta-ibm/meta-palmetto/conf/layer.conf b/meta-ibm/meta-palmetto/conf/layer.conf
index c670815..3f85ef2 100644
--- a/meta-ibm/meta-palmetto/conf/layer.conf
+++ b/meta-ibm/meta-palmetto/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "palmetto-layer"
 BBFILE_PATTERN_palmetto-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_palmetto-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_palmetto-layer = "nanbield scarthgap"
diff --git a/meta-ibm/meta-romulus/conf/layer.conf b/meta-ibm/meta-romulus/conf/layer.conf
index 9348f97..2441ef1 100644
--- a/meta-ibm/meta-romulus/conf/layer.conf
+++ b/meta-ibm/meta-romulus/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "romulus-layer"
 BBFILE_PATTERN_romulus-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_romulus-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_romulus-layer = "nanbield scarthgap"
diff --git a/meta-ibm/meta-sbp1/conf/layer.conf b/meta-ibm/meta-sbp1/conf/layer.conf
index dabffc3..81369bc 100644
--- a/meta-ibm/meta-sbp1/conf/layer.conf
+++ b/meta-ibm/meta-sbp1/conf/layer.conf
@@ -6,4 +6,4 @@
 
 BBFILE_COLLECTIONS += "sbp1-layer"
 BBFILE_PATTERN_sbp1-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_sbp1-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_sbp1-layer = "nanbield scarthgap"
diff --git a/meta-ibm/meta-system1/conf/layer.conf b/meta-ibm/meta-system1/conf/layer.conf
index 1262a04..ac7d48d 100644
--- a/meta-ibm/meta-system1/conf/layer.conf
+++ b/meta-ibm/meta-system1/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "system1-layer"
 BBFILE_PATTERN_system1-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_system1-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_system1-layer = "nanbield scarthgap"