diff --git a/meta-hpe/conf/layer.conf b/meta-hpe/conf/layer.conf
index 7c1f688..eee2e7b 100644
--- a/meta-hpe/conf/layer.conf
+++ b/meta-hpe/conf/layer.conf
@@ -7,7 +7,7 @@
 
 BBFILE_COLLECTIONS += "hpe-layer"
 BBFILE_PATTERN_hpe-layer := "^${LAYERDIR}/meta-common/"
-LAYERSERIES_COMPAT_hpe-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_hpe-layer = "nanbield scarthgap"
 
 # Provide a variable that points the base of the hpe layer.
 HPEBASE = '${@os.path.normpath("${LAYERDIR}/")}'
diff --git a/meta-hpe/meta-common/conf/layer.conf b/meta-hpe/meta-common/conf/layer.conf
index cb6b046..82f1a93 100644
--- a/meta-hpe/meta-common/conf/layer.conf
+++ b/meta-hpe/meta-common/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "common-layer"
 BBFILE_PATTERN_common-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_common-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_common-layer = "nanbield scarthgap"
diff --git a/meta-hpe/meta-dl360-g11/conf/layer.conf b/meta-hpe/meta-dl360-g11/conf/layer.conf
index 9cdb9f9..a2c2997 100644
--- a/meta-hpe/meta-dl360-g11/conf/layer.conf
+++ b/meta-hpe/meta-dl360-g11/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "dl360-g11-layer"
 BBFILE_PATTERN_dl360-g11-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_dl360-g11-layer := "mickledore nanbield"
+LAYERSERIES_COMPAT_dl360-g11-layer := "nanbield scarthgap"
diff --git a/meta-hpe/meta-dl360poc/conf/layer.conf b/meta-hpe/meta-dl360poc/conf/layer.conf
index ab29d3e..e1ca404 100644
--- a/meta-hpe/meta-dl360poc/conf/layer.conf
+++ b/meta-hpe/meta-dl360poc/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "dl360poc-layer"
 BBFILE_PATTERN_dl360poc-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_dl360poc-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_dl360poc-layer = "nanbield scarthgap"
diff --git a/meta-hpe/meta-gxp/conf/layer.conf b/meta-hpe/meta-gxp/conf/layer.conf
index e947f0a..9749cbd 100644
--- a/meta-hpe/meta-gxp/conf/layer.conf
+++ b/meta-hpe/meta-gxp/conf/layer.conf
@@ -7,6 +7,6 @@
 BBFILE_COLLECTIONS += "gxp-layer"
 BBFILE_PATTERN_gxp-layer = "^${LAYERDIR}/"
 LAYERVERSION_gxp-layer = "1"
-LAYERSERIES_COMPAT_gxp-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_gxp-layer = "nanbield scarthgap"
 
 GXPBASE = '${@os.path.normpath("${LAYERDIR}/")}'
diff --git a/meta-hpe/meta-rl300-g11/conf/layer.conf b/meta-hpe/meta-rl300-g11/conf/layer.conf
index 4e38893..44ff96b 100644
--- a/meta-hpe/meta-rl300-g11/conf/layer.conf
+++ b/meta-hpe/meta-rl300-g11/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "rl300-g11-layer"
 BBFILE_PATTERN_rl300-g11-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_rl300-g11-layer := "mickledore nanbield"
+LAYERSERIES_COMPAT_rl300-g11-layer := "nanbield scarthgap"