diff --git a/meta-quanta/conf/layer.conf b/meta-quanta/conf/layer.conf
index db9aa2b..608f46c 100644
--- a/meta-quanta/conf/layer.conf
+++ b/meta-quanta/conf/layer.conf
@@ -7,5 +7,5 @@
 
 BBFILE_COLLECTIONS += "quanta-layer"
 BBFILE_PATTERN_quanta-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_quanta-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_quanta-layer = "nanbield scarthgap"
 LAYERDEPENDS_quanta-layer = "phosphor-layer"
diff --git a/meta-quanta/meta-f0b/conf/layer.conf b/meta-quanta/meta-f0b/conf/layer.conf
index 93f46a3..19b58c2 100644
--- a/meta-quanta/meta-f0b/conf/layer.conf
+++ b/meta-quanta/meta-f0b/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "f0b-layer"
 BBFILE_PATTERN_f0b-layer = ""
-LAYERSERIES_COMPAT_f0b-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_f0b-layer = "nanbield scarthgap"
diff --git a/meta-quanta/meta-gbs/conf/layer.conf b/meta-quanta/meta-gbs/conf/layer.conf
index e639653..a607c5b 100644
--- a/meta-quanta/meta-gbs/conf/layer.conf
+++ b/meta-quanta/meta-gbs/conf/layer.conf
@@ -7,5 +7,5 @@
 
 BBFILE_COLLECTIONS += "gbs-layer"
 BBFILE_PATTERN_gbs-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_gbs-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_gbs-layer = "nanbield scarthgap"
 LAYERDEPENDS_gbs-layer = "core phosphor-layer google-layer quanta-layer"
diff --git a/meta-quanta/meta-olympus-nuvoton/conf/layer.conf b/meta-quanta/meta-olympus-nuvoton/conf/layer.conf
index 08b38fa..ff0f913 100644
--- a/meta-quanta/meta-olympus-nuvoton/conf/layer.conf
+++ b/meta-quanta/meta-olympus-nuvoton/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "olympus-nuvoton-layer"
 BBFILE_PATTERN_olympus-nuvoton-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_olympus-nuvoton-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_olympus-nuvoton-layer = "nanbield scarthgap"
diff --git a/meta-quanta/meta-q71l/conf/layer.conf b/meta-quanta/meta-q71l/conf/layer.conf
index 986cf33..e6bb273 100644
--- a/meta-quanta/meta-q71l/conf/layer.conf
+++ b/meta-quanta/meta-q71l/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "q71l"
 BBFILE_PATTERN_q71l = ""
-LAYERSERIES_COMPAT_q71l = "mickledore nanbield"
+LAYERSERIES_COMPAT_q71l = "nanbield scarthgap"
diff --git a/meta-quanta/meta-s6q/conf/layer.conf b/meta-quanta/meta-s6q/conf/layer.conf
index ac42910..3dab7f0 100644
--- a/meta-quanta/meta-s6q/conf/layer.conf
+++ b/meta-quanta/meta-s6q/conf/layer.conf
@@ -8,4 +8,4 @@
 BBFILE_COLLECTIONS += "s6q-layer"
 BBFILE_PATTERN_s6q-layer := "^${LAYERDIR}/"
 
-LAYERSERIES_COMPAT_s6q-layer := "mickledore nanbield"
+LAYERSERIES_COMPAT_s6q-layer := "nanbield scarthgap"