diff --git a/meta-amd/conf/layer.conf b/meta-amd/conf/layer.conf
index 000e643..2a62b58 100644
--- a/meta-amd/conf/layer.conf
+++ b/meta-amd/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "amd-layer"
 BBFILE_PATTERN_amd-layer = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_amd-layer = "kirkstone langdale"
+LAYERSERIES_COMPAT_amd-layer = "langdale mickledore"
diff --git a/meta-amd/meta-ethanolx/conf/layer.conf b/meta-amd/meta-ethanolx/conf/layer.conf
index 54d3515..b6875ac 100644
--- a/meta-amd/meta-ethanolx/conf/layer.conf
+++ b/meta-amd/meta-ethanolx/conf/layer.conf
@@ -9,4 +9,4 @@
 BBFILE_PATTERN_ethanolx-layer = "^${LAYERDIR}/"
 BBFILE_PRIORITY_ethanolx-layer = "6"
 
-LAYERSERIES_COMPAT_ethanolx-layer = "kirkstone langdale"
+LAYERSERIES_COMPAT_ethanolx-layer = "langdale mickledore"
diff --git a/meta-ampere/conf/layer.conf b/meta-ampere/conf/layer.conf
index d6bce1e..12f55ee 100644
--- a/meta-ampere/conf/layer.conf
+++ b/meta-ampere/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "ampere-layer"
 BBFILE_PATTERN_ampere-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_ampere-layer = "kirkstone langdale"
+LAYERSERIES_COMPAT_ampere-layer = "langdale mickledore"
diff --git a/meta-ampere/meta-jade/conf/layer.conf b/meta-ampere/meta-jade/conf/layer.conf
index 1797275..51b03a1 100644
--- a/meta-ampere/meta-jade/conf/layer.conf
+++ b/meta-ampere/meta-jade/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "jade-layer"
 BBFILE_PATTERN_jade-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_jade-layer = "kirkstone langdale"
+LAYERSERIES_COMPAT_jade-layer = "langdale mickledore"
diff --git a/meta-ampere/meta-mitchell/conf/layer.conf b/meta-ampere/meta-mitchell/conf/layer.conf
index 3855afb..8f58810 100644
--- a/meta-ampere/meta-mitchell/conf/layer.conf
+++ b/meta-ampere/meta-mitchell/conf/layer.conf
@@ -7,5 +7,5 @@
 
 BBFILE_COLLECTIONS += "mitchell-layer"
 BBFILE_PATTERN_mitchell-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_mitchell-layer = "kirkstone langdale"
+LAYERSERIES_COMPAT_mitchell-layer = "langdale mickledore"
 
diff --git a/meta-aspeed/conf/layer.conf b/meta-aspeed/conf/layer.conf
index f08c442..96b1fbc 100644
--- a/meta-aspeed/conf/layer.conf
+++ b/meta-aspeed/conf/layer.conf
@@ -7,4 +7,4 @@
 BBFILE_COLLECTIONS += "aspeed-layer"
 BBFILE_PATTERN_aspeed-layer := "^${LAYERDIR}/"
 LAYERVERSION_aspeed-layer = "1"
-LAYERSERIES_COMPAT_aspeed-layer = "kirkstone langdale"
+LAYERSERIES_COMPAT_aspeed-layer = "langdale mickledore"
diff --git a/meta-asrock/conf/layer.conf b/meta-asrock/conf/layer.conf
index 1992e6f..fea5f22 100644
--- a/meta-asrock/conf/layer.conf
+++ b/meta-asrock/conf/layer.conf
@@ -8,4 +8,4 @@
 BBFILE_COLLECTIONS += "asrock-layer"
 BBFILE_PATTERN_asrock-layer = "^${LAYERDIR}/"
 LAYERVERSION_asrock-layer = "1"
-LAYERSERIES_COMPAT_asrock-layer = "kirkstone langdale"
+LAYERSERIES_COMPAT_asrock-layer = "langdale mickledore"
diff --git a/meta-asrock/meta-e3c246d4i/conf/layer.conf b/meta-asrock/meta-e3c246d4i/conf/layer.conf
index c1914eb..1beadb4 100644
--- a/meta-asrock/meta-e3c246d4i/conf/layer.conf
+++ b/meta-asrock/meta-e3c246d4i/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "e3c246d4i-layer"
 BBFILE_PATTERN_e3c246d4i-layer = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_e3c246d4i-layer = "kirkstone langdale"
+LAYERSERIES_COMPAT_e3c246d4i-layer = "langdale mickledore"
diff --git a/meta-asrock/meta-romed8hm3/conf/layer.conf b/meta-asrock/meta-romed8hm3/conf/layer.conf
index 43ca5d9..860dfe5 100644
--- a/meta-asrock/meta-romed8hm3/conf/layer.conf
+++ b/meta-asrock/meta-romed8hm3/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "romed8hm3-layer"
 BBFILE_PATTERN_romed8hm3-layer = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_romed8hm3-layer = "kirkstone langdale"
+LAYERSERIES_COMPAT_romed8hm3-layer = "langdale mickledore"
diff --git a/meta-bytedance/conf/layer.conf b/meta-bytedance/conf/layer.conf
index 0e1f56b..85bba89 100644
--- a/meta-bytedance/conf/layer.conf
+++ b/meta-bytedance/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "bytedance-layer"
 BBFILE_PATTERN_bytedance-layer = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_bytedance-layer = "kirkstone langdale"
+LAYERSERIES_COMPAT_bytedance-layer = "langdale mickledore"
diff --git a/meta-bytedance/meta-g220a/conf/layer.conf b/meta-bytedance/meta-g220a/conf/layer.conf
index 2176f20e..a6fca29 100644
--- a/meta-bytedance/meta-g220a/conf/layer.conf
+++ b/meta-bytedance/meta-g220a/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "g220a-layer"
 BBFILE_PATTERN_g220a-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_g220a-layer = "kirkstone langdale"
+LAYERSERIES_COMPAT_g220a-layer = "langdale mickledore"
diff --git a/meta-delta/conf/layer.conf b/meta-delta/conf/layer.conf
index 0f454e2..42e34a3 100644
--- a/meta-delta/conf/layer.conf
+++ b/meta-delta/conf/layer.conf
@@ -8,4 +8,4 @@
 BBFILE_COLLECTIONS += "delta-layer"
 BBFILE_PATTERN_delta-layer = "^${LAYERDIR}/"
 LAYERVERSION_delta-layer = "1"
-LAYERSERIES_COMPAT_delta-layer = "kirkstone langdale"
+LAYERSERIES_COMPAT_delta-layer = "langdale mickledore"
diff --git a/meta-delta/meta-ahe50dc/conf/layer.conf b/meta-delta/meta-ahe50dc/conf/layer.conf
index 2560575..c3db17a 100644
--- a/meta-delta/meta-ahe50dc/conf/layer.conf
+++ b/meta-delta/meta-ahe50dc/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "ahe50dc-layer"
 BBFILE_PATTERN_ahe50dc-layer = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_ahe50dc-layer = "kirkstone langdale"
+LAYERSERIES_COMPAT_ahe50dc-layer = "langdale mickledore"
diff --git a/meta-evb/conf/layer.conf b/meta-evb/conf/layer.conf
index debc7fc..aa6b56f 100644
--- a/meta-evb/conf/layer.conf
+++ b/meta-evb/conf/layer.conf
@@ -3,4 +3,4 @@
 
 BBFILE_COLLECTIONS += "evb"
 BBFILE_PATTERN_evb = ""
-LAYERSERIES_COMPAT_evb = "kirkstone langdale"
+LAYERSERIES_COMPAT_evb = "langdale mickledore"
diff --git a/meta-evb/meta-evb-aspeed/conf/layer.conf b/meta-evb/meta-evb-aspeed/conf/layer.conf
index 6cecf5d..13a27f3 100644
--- a/meta-evb/meta-evb-aspeed/conf/layer.conf
+++ b/meta-evb/meta-evb-aspeed/conf/layer.conf
@@ -4,4 +4,4 @@
 BBFILE_COLLECTIONS += "evb-aspeed"
 BBFILE_PATTERN_evb-aspeed = ""
 
-LAYERSERIES_COMPAT_evb-aspeed = "kirkstone langdale"
+LAYERSERIES_COMPAT_evb-aspeed = "langdale mickledore"
diff --git a/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/layer.conf b/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/layer.conf
index 79d5c9f..b3045cf 100644
--- a/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/layer.conf
+++ b/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/layer.conf
@@ -4,4 +4,4 @@
 BBFILE_COLLECTIONS += "evb-ast2500"
 BBFILE_PATTERN_evb-ast2500 = ""
 
-LAYERSERIES_COMPAT_evb-ast2500 = "kirkstone langdale"
+LAYERSERIES_COMPAT_evb-ast2500 = "langdale mickledore"
diff --git a/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/layer.conf b/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/layer.conf
index 70aa23c..700de00 100644
--- a/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/layer.conf
+++ b/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/layer.conf
@@ -8,4 +8,4 @@
 BBFILE_COLLECTIONS += "meta-evb-ast2600"
 BBFILE_PATTERN_meta-evb-ast2600 = "^${LAYERDIR}/"
 
-LAYERSERIES_COMPAT_meta-evb-ast2600 = "kirkstone langdale"
+LAYERSERIES_COMPAT_meta-evb-ast2600 = "langdale mickledore"
diff --git a/meta-evb/meta-evb-nuvoton/conf/layer.conf b/meta-evb/meta-evb-nuvoton/conf/layer.conf
index 314bde1..f19d857 100644
--- a/meta-evb/meta-evb-nuvoton/conf/layer.conf
+++ b/meta-evb/meta-evb-nuvoton/conf/layer.conf
@@ -3,4 +3,4 @@
 
 BBFILE_COLLECTIONS += "evb-nuvoton"
 BBFILE_PATTERN_evb-nuvoton = ""
-LAYERSERIES_COMPAT_evb-nuvoton = "kirkstone langdale"
+LAYERSERIES_COMPAT_evb-nuvoton = "langdale mickledore"
diff --git a/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/layer.conf b/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/layer.conf
index 1193c7c..878e029 100644
--- a/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/layer.conf
+++ b/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/layer.conf
@@ -3,4 +3,4 @@
 
 BBFILE_COLLECTIONS += "evb-npcm750"
 BBFILE_PATTERN_evb-npcm750 = ""
-LAYERSERIES_COMPAT_evb-npcm750 = "kirkstone langdale"
+LAYERSERIES_COMPAT_evb-npcm750 = "langdale mickledore"
diff --git a/meta-evb/meta-evb-nuvoton/meta-evb-npcm845/conf/layer.conf b/meta-evb/meta-evb-nuvoton/meta-evb-npcm845/conf/layer.conf
index a1959cc..7b12b18 100644
--- a/meta-evb/meta-evb-nuvoton/meta-evb-npcm845/conf/layer.conf
+++ b/meta-evb/meta-evb-nuvoton/meta-evb-npcm845/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "evb-npcm845"
 BBFILE_PATTERN_evb-npcm845 = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_evb-npcm845 = "kirkstone langdale"
+LAYERSERIES_COMPAT_evb-npcm845 = "langdale mickledore"
diff --git a/meta-facebook/conf/layer.conf b/meta-facebook/conf/layer.conf
index dfb68fb..10d1153 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 := "kirkstone langdale"
+LAYERSERIES_COMPAT_facebook-layer := "langdale mickledore"
diff --git a/meta-facebook/meta-bletchley/conf/layer.conf b/meta-facebook/meta-bletchley/conf/layer.conf
index f5c684a..4a9a45b 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 := "kirkstone langdale"
+LAYERSERIES_COMPAT_bletchley-layer := "langdale mickledore"
diff --git a/meta-facebook/meta-greatlakes/conf/layer.conf b/meta-facebook/meta-greatlakes/conf/layer.conf
index 40d0f10..76f1226 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 := "kirkstone langdale"
+LAYERSERIES_COMPAT_greatlakes-layer := "langdale mickledore"
diff --git a/meta-facebook/meta-tiogapass/conf/layer.conf b/meta-facebook/meta-tiogapass/conf/layer.conf
index 88486e6..08f40d8 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 := "kirkstone langdale"
+LAYERSERIES_COMPAT_tiogapass-layer := "langdale mickledore"
diff --git a/meta-facebook/meta-yosemitev2/conf/layer.conf b/meta-facebook/meta-yosemitev2/conf/layer.conf
index e4c114b..861d65a 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 := "kirkstone langdale"
+LAYERSERIES_COMPAT_yosemitev2-layer := "langdale mickledore"
diff --git a/meta-fii/conf/layer.conf b/meta-fii/conf/layer.conf
index 6fea782..ff1d7fb 100644
--- a/meta-fii/conf/layer.conf
+++ b/meta-fii/conf/layer.conf
@@ -5,4 +5,4 @@
             ${LAYERDIR}/recipes-*/*/*.bbappend"
 BBFILE_COLLECTIONS += "fii-layer"
 BBFILE_PATTERN_fii-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_fii-layer = "kirkstone langdale"
+LAYERSERIES_COMPAT_fii-layer = "langdale mickledore"
diff --git a/meta-fii/meta-kudo/conf/layer.conf b/meta-fii/meta-kudo/conf/layer.conf
index b236eec..bf32761 100644
--- a/meta-fii/meta-kudo/conf/layer.conf
+++ b/meta-fii/meta-kudo/conf/layer.conf
@@ -7,5 +7,5 @@
 
 BBFILE_COLLECTIONS += "kudo-layer"
 BBFILE_PATTERN_kudo-layer = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_kudo-layer = "kirkstone langdale"
+LAYERSERIES_COMPAT_kudo-layer = "langdale mickledore"
 LAYERDEPENDS_kudo-layer = "core phosphor-layer google-layer fii-layer"
diff --git a/meta-fii/meta-mori/conf/layer.conf b/meta-fii/meta-mori/conf/layer.conf
index 5473f40..3c5f5ec 100644
--- a/meta-fii/meta-mori/conf/layer.conf
+++ b/meta-fii/meta-mori/conf/layer.conf
@@ -7,5 +7,5 @@
 
 BBFILE_COLLECTIONS += "mori-layer"
 BBFILE_PATTERN_mori-layer = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_mori-layer = "kirkstone langdale"
+LAYERSERIES_COMPAT_mori-layer = "langdale mickledore"
 LAYERDEPENDS_mori-layer = "core phosphor-layer google-layer fii-layer"
diff --git a/meta-google/conf/layer.conf b/meta-google/conf/layer.conf
index a5e1469..a75bd8b 100644
--- a/meta-google/conf/layer.conf
+++ b/meta-google/conf/layer.conf
@@ -14,5 +14,5 @@
 BBFILE_COLLECTIONS += "google-layer"
 BBFILE_PATTERN_google-layer := "^${LAYERDIR}/"
 LAYERVERSION_google-layer = "1"
-LAYERSERIES_COMPAT_google-layer = "kirkstone langdale"
+LAYERSERIES_COMPAT_google-layer = "langdale mickledore"
 LAYERDEPENDS_google-layer += "core phosphor-layer"
diff --git a/meta-hpe/conf/layer.conf b/meta-hpe/conf/layer.conf
index 8ce2d69..c9a8b59 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 = "kirkstone langdale"
+LAYERSERIES_COMPAT_hpe-layer = "langdale mickledore"
 
 # Provide a variable that points the base of the hpe layer.
 HPEBASE = '${@os.path.normpath("${LAYERDIR}/")}'
diff --git a/meta-hpe/meta-dl360poc/conf/layer.conf b/meta-hpe/meta-dl360poc/conf/layer.conf
index ab69842..1fc6440 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 = "kirkstone langdale"
+LAYERSERIES_COMPAT_dl360poc-layer = "langdale mickledore"
diff --git a/meta-hpe/meta-gxp/conf/layer.conf b/meta-hpe/meta-gxp/conf/layer.conf
index f36f030..58e0db3 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 = "kirkstone langdale"
+LAYERSERIES_COMPAT_gxp-layer = "langdale mickledore"
 
 GXPBASE = '${@os.path.normpath("${LAYERDIR}/")}'
diff --git a/meta-ibm/conf/layer.conf b/meta-ibm/conf/layer.conf
index 3067adc..763f4f5 100644
--- a/meta-ibm/conf/layer.conf
+++ b/meta-ibm/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "ibm-layer"
 BBFILE_PATTERN_ibm-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_ibm-layer = "kirkstone langdale"
+LAYERSERIES_COMPAT_ibm-layer = "langdale mickledore"
diff --git a/meta-ibm/meta-palmetto/conf/layer.conf b/meta-ibm/meta-palmetto/conf/layer.conf
index f03e22d..3f51f25 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 = "kirkstone langdale"
+LAYERSERIES_COMPAT_palmetto-layer = "langdale mickledore"
diff --git a/meta-ibm/meta-romulus/conf/layer.conf b/meta-ibm/meta-romulus/conf/layer.conf
index ccab18a..a0b4129 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 = "kirkstone langdale"
+LAYERSERIES_COMPAT_romulus-layer = "langdale mickledore"
diff --git a/meta-ingrasys/conf/layer.conf b/meta-ingrasys/conf/layer.conf
index 31ebacd..25cce80 100644
--- a/meta-ingrasys/conf/layer.conf
+++ b/meta-ingrasys/conf/layer.conf
@@ -3,4 +3,4 @@
 
 BBFILE_COLLECTIONS += "ingrasys"
 BBFILE_PATTERN_ingrasys := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_ingrasys = "kirkstone langdale"
+LAYERSERIES_COMPAT_ingrasys = "langdale mickledore"
diff --git a/meta-ingrasys/meta-zaius/conf/layer.conf b/meta-ingrasys/meta-zaius/conf/layer.conf
index 505b39d..1960069 100644
--- a/meta-ingrasys/meta-zaius/conf/layer.conf
+++ b/meta-ingrasys/meta-zaius/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "zaius"
 BBFILE_PATTERN_zaius := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_zaius = "kirkstone langdale"
+LAYERSERIES_COMPAT_zaius = "langdale mickledore"
diff --git a/meta-inspur/conf/layer.conf b/meta-inspur/conf/layer.conf
index f637efa..13933cb 100644
--- a/meta-inspur/conf/layer.conf
+++ b/meta-inspur/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "inspur-layer"
 BBFILE_PATTERN_inspur-layer = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_inspur-layer = "kirkstone langdale"
+LAYERSERIES_COMPAT_inspur-layer = "langdale mickledore"
diff --git a/meta-inspur/meta-fp5280g2/conf/layer.conf b/meta-inspur/meta-fp5280g2/conf/layer.conf
index daf2265..44326ad 100644
--- a/meta-inspur/meta-fp5280g2/conf/layer.conf
+++ b/meta-inspur/meta-fp5280g2/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "fp5280g2-layer"
 BBFILE_PATTERN_fp5280g2-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_fp5280g2-layer = "kirkstone langdale"
+LAYERSERIES_COMPAT_fp5280g2-layer = "langdale mickledore"
diff --git a/meta-inspur/meta-on5263m5/conf/layer.conf b/meta-inspur/meta-on5263m5/conf/layer.conf
index 3f24e1f..fee4fb5 100644
--- a/meta-inspur/meta-on5263m5/conf/layer.conf
+++ b/meta-inspur/meta-on5263m5/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "on5263m5-layer"
 BBFILE_PATTERN_on5263m5-layer = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_on5263m5-layer = "kirkstone langdale"
+LAYERSERIES_COMPAT_on5263m5-layer = "langdale mickledore"
diff --git a/meta-intel-openbmc/conf/layer.conf b/meta-intel-openbmc/conf/layer.conf
index 95ad092..de157ad 100644
--- a/meta-intel-openbmc/conf/layer.conf
+++ b/meta-intel-openbmc/conf/layer.conf
@@ -8,5 +8,5 @@
 BBFILE_COLLECTIONS += "intel"
 BBFILE_PATTERN_intel = "^${LAYERDIR}/"
 LAYERVERSION_intel = "1"
-LAYERSERIES_COMPAT_intel = "kirkstone langdale"
+LAYERSERIES_COMPAT_intel = "langdale mickledore"
 LAYERDEPENDS_intel = "phosphor-layer"
diff --git a/meta-intel-openbmc/meta-s2600wf/conf/layer.conf b/meta-intel-openbmc/meta-s2600wf/conf/layer.conf
index 8d36bd7..907c90f 100644
--- a/meta-intel-openbmc/meta-s2600wf/conf/layer.conf
+++ b/meta-intel-openbmc/meta-s2600wf/conf/layer.conf
@@ -8,4 +8,4 @@
 BBFILE_COLLECTIONS += "s2600wf"
 BBFILE_PATTERN_s2600wf = ""
 BBFILE_PRIORITY_s2600wf = "5"
-LAYERSERIES_COMPAT_s2600wf = "kirkstone langdale"
+LAYERSERIES_COMPAT_s2600wf = "langdale mickledore"
diff --git a/meta-inventec/conf/layer.conf b/meta-inventec/conf/layer.conf
index 16a56c1..0ce75bf 100644
--- a/meta-inventec/conf/layer.conf
+++ b/meta-inventec/conf/layer.conf
@@ -7,7 +7,7 @@
 
 BBFILE_COLLECTIONS += "inventec"
 BBFILE_PATTERN_inventec := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_inventec = "kirkstone langdale"
+LAYERSERIES_COMPAT_inventec = "langdale mickledore"
 BBFILE_PRIORITY_inventec = "6"
 
 # Provide a variable that points the base of the hpe layer.
diff --git a/meta-inventec/meta-common/conf/layer.conf b/meta-inventec/meta-common/conf/layer.conf
index acd0b17..8ccf3b2 100644
--- a/meta-inventec/meta-common/conf/layer.conf
+++ b/meta-inventec/meta-common/conf/layer.conf
@@ -8,4 +8,4 @@
 BBFILE_COLLECTIONS += "common"
 BBFILE_PATTERN_common = "^${LAYERDIR}/"
 BBFILE_PRIORITY_common = "10"
-LAYERSERIES_COMPAT_common = "kirkstone langdale"
+LAYERSERIES_COMPAT_common = "langdale mickledore"
diff --git a/meta-inventec/meta-transformers/conf/layer.conf b/meta-inventec/meta-transformers/conf/layer.conf
index 6fd96b2..74165bb 100755
--- a/meta-inventec/meta-transformers/conf/layer.conf
+++ b/meta-inventec/meta-transformers/conf/layer.conf
@@ -8,4 +8,4 @@
 BBFILE_COLLECTIONS += "transformers"
 BBFILE_PATTERN_transformers = "^${LAYERDIR}/"
 BBFILE_PRIORITY_transformers = "7"
-LAYERSERIES_COMPAT_transformers = "kirkstone langdale"
+LAYERSERIES_COMPAT_transformers = "langdale mickledore"
diff --git a/meta-nuvoton/conf/layer.conf b/meta-nuvoton/conf/layer.conf
index e74562d..90c5b53 100644
--- a/meta-nuvoton/conf/layer.conf
+++ b/meta-nuvoton/conf/layer.conf
@@ -7,7 +7,7 @@
 BBFILE_COLLECTIONS += "nuvoton-layer"
 BBFILE_PATTERN_nuvoton-layer = ""
 LAYERVERSION_nuvoton-layer = "1"
-LAYERSERIES_COMPAT_nuvoton-layer = "kirkstone langdale"
+LAYERSERIES_COMPAT_nuvoton-layer = "langdale mickledore"
 LAYERDEPENDS_nuvoton-layer:append:npcm8xx = " meta-arm"
 
 BBFILES_DYNAMIC += " \
diff --git a/meta-openpower/conf/layer.conf b/meta-openpower/conf/layer.conf
index ef36835..57212b8 100644
--- a/meta-openpower/conf/layer.conf
+++ b/meta-openpower/conf/layer.conf
@@ -9,4 +9,4 @@
 BBFILE_PATTERN_openpower-layer := "^${LAYERDIR}/"
 LAYERVERSION_openpower-layer = "1"
 LAYERDEPENDS_openpower-layer = "core phosphor-layer aspeed-layer"
-LAYERSERIES_COMPAT_openpower-layer = "kirkstone langdale"
+LAYERSERIES_COMPAT_openpower-layer = "langdale mickledore"
diff --git a/meta-phosphor/conf/layer.conf b/meta-phosphor/conf/layer.conf
index 8b5a2b1..498e16d 100644
--- a/meta-phosphor/conf/layer.conf
+++ b/meta-phosphor/conf/layer.conf
@@ -12,7 +12,7 @@
 LAYERDEPENDS_phosphor-layer += "openembedded-layer"
 LAYERDEPENDS_phosphor-layer += "meta-python"
 LAYERDEPENDS_phosphor-layer += "networking-layer"
-LAYERSERIES_COMPAT_phosphor-layer = "kirkstone langdale"
+LAYERSERIES_COMPAT_phosphor-layer = "langdale mickledore"
 
 IMAGE_FEATURES[validitems] += "tools-profile"
 
diff --git a/meta-qualcomm/conf/layer.conf b/meta-qualcomm/conf/layer.conf
index 7fddf4a..5b28cfe 100644
--- a/meta-qualcomm/conf/layer.conf
+++ b/meta-qualcomm/conf/layer.conf
@@ -8,6 +8,6 @@
 BBFILE_COLLECTIONS += "qualcomm-layer"
 BBFILE_PATTERN_qualcomm-layer := "^${LAYERDIR}/"
 
-LAYERSERIES_COMPAT_qualcomm-layer = "kirkstone langdale"
+LAYERSERIES_COMPAT_qualcomm-layer = "langdale mickledore"
 
 QCOMBASE = '${@os.path.normpath("${LAYERDIR}/")}'
diff --git a/meta-quanta/conf/layer.conf b/meta-quanta/conf/layer.conf
index 44f21a4..e5b7f14 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 = "kirkstone langdale"
+LAYERSERIES_COMPAT_quanta-layer = "langdale mickledore"
 LAYERDEPENDS_quanta-layer = "phosphor-layer"
diff --git a/meta-quanta/meta-f0b/conf/layer.conf b/meta-quanta/meta-f0b/conf/layer.conf
index c2bc534..0314a71 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 = "kirkstone langdale"
+LAYERSERIES_COMPAT_f0b-layer = "langdale mickledore"
diff --git a/meta-quanta/meta-gbs/conf/layer.conf b/meta-quanta/meta-gbs/conf/layer.conf
index 18f671b..d70ac9f 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 = "kirkstone langdale"
+LAYERSERIES_COMPAT_gbs-layer = "langdale mickledore"
 LAYERDEPENDS_gbs-layer = "core phosphor-layer google-layer quanta-layer"
diff --git a/meta-quanta/meta-gsj/conf/layer.conf b/meta-quanta/meta-gsj/conf/layer.conf
index 807437a..a9e70bb 100644
--- a/meta-quanta/meta-gsj/conf/layer.conf
+++ b/meta-quanta/meta-gsj/conf/layer.conf
@@ -7,5 +7,5 @@
 
 BBFILE_COLLECTIONS += "gsj-layer"
 BBFILE_PATTERN_gsj-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_gsj-layer = "kirkstone langdale"
+LAYERSERIES_COMPAT_gsj-layer = "langdale mickledore"
 LAYERDEPENDS_gsj-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 3add400..d0a09d7 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 = "kirkstone langdale"
+LAYERSERIES_COMPAT_olympus-nuvoton-layer = "langdale mickledore"
diff --git a/meta-quanta/meta-q71l/conf/layer.conf b/meta-quanta/meta-q71l/conf/layer.conf
index d0f57d6..5bb8d1f 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 = "kirkstone langdale"
+LAYERSERIES_COMPAT_q71l = "langdale mickledore"
diff --git a/meta-quanta/meta-s6q/conf/layer.conf b/meta-quanta/meta-s6q/conf/layer.conf
index 390431e..117f688 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 := "kirkstone langdale"
+LAYERSERIES_COMPAT_s6q-layer := "langdale mickledore"
diff --git a/meta-security/conf/layer.conf b/meta-security/conf/layer.conf
index 470c7f6..84346a1 100644
--- a/meta-security/conf/layer.conf
+++ b/meta-security/conf/layer.conf
@@ -9,7 +9,7 @@
 BBFILE_PATTERN_security = "^${LAYERDIR}/"
 BBFILE_PRIORITY_security = "8"
 
-LAYERSERIES_COMPAT_security = "kirkstone langdale"
+LAYERSERIES_COMPAT_security = "langdale mickledore"
 
 LAYERDEPENDS_security = "core openembedded-layer"
 
diff --git a/meta-security/meta-hardening/conf/layer.conf b/meta-security/meta-hardening/conf/layer.conf
index 5983161..a150085 100644
--- a/meta-security/meta-hardening/conf/layer.conf
+++ b/meta-security/meta-hardening/conf/layer.conf
@@ -8,6 +8,6 @@
 BBFILE_PATTERN_harden-layer = "^${LAYERDIR}/"
 BBFILE_PRIORITY_harden-layer = "10"
 
-LAYERSERIES_COMPAT_harden-layer = "kirkstone langdale"
+LAYERSERIES_COMPAT_harden-layer = "langdale mickledore"
 
 LAYERDEPENDS_harden-layer = "core openembedded-layer"
diff --git a/meta-security/meta-integrity/conf/layer.conf b/meta-security/meta-integrity/conf/layer.conf
index 1fcf33c..237306d 100644
--- a/meta-security/meta-integrity/conf/layer.conf
+++ b/meta-security/meta-integrity/conf/layer.conf
@@ -20,7 +20,7 @@
 # interactive shell is enough.
 OE_TERMINAL_EXPORTS += "INTEGRITY_BASE"
 
-LAYERSERIES_COMPAT_integrity = "kirkstone langdale"
+LAYERSERIES_COMPAT_integrity = "langdale mickledore"
 # ima-evm-utils depends on keyutils from meta-oe
 LAYERDEPENDS_integrity = "core openembedded-layer"
 
diff --git a/meta-security/meta-parsec/conf/layer.conf b/meta-security/meta-parsec/conf/layer.conf
index a748d77..3495235 100644
--- a/meta-security/meta-parsec/conf/layer.conf
+++ b/meta-security/meta-parsec/conf/layer.conf
@@ -8,7 +8,7 @@
 BBFILE_PATTERN_parsec-layer = "^${LAYERDIR}/"
 BBFILE_PRIORITY_parsec-layer = "5"
 
-LAYERSERIES_COMPAT_parsec-layer = "kirkstone langdale"
+LAYERSERIES_COMPAT_parsec-layer = "langdale mickledore"
 
 LAYERDEPENDS_parsec-layer = "core clang-layer"
 BBLAYERS_LAYERINDEX_NAME_parsec-layer = "meta-parsec"
diff --git a/meta-security/meta-security-compliance/conf/layer.conf b/meta-security/meta-security-compliance/conf/layer.conf
index ec57541..a250f5c 100644
--- a/meta-security/meta-security-compliance/conf/layer.conf
+++ b/meta-security/meta-security-compliance/conf/layer.conf
@@ -8,7 +8,7 @@
 BBFILE_PATTERN_scanners-layer = "^${LAYERDIR}/"
 BBFILE_PRIORITY_scanners-layer = "10"
 
-LAYERSERIES_COMPAT_scanners-layer = "kirkstone langdale"
+LAYERSERIES_COMPAT_scanners-layer = "langdale mickledore"
 
 LAYERDEPENDS_scanners-layer = "core openembedded-layer meta-python"
 
diff --git a/meta-security/meta-security-isafw/conf/layer.conf b/meta-security/meta-security-isafw/conf/layer.conf
index 724742d..bc88530 100644
--- a/meta-security/meta-security-isafw/conf/layer.conf
+++ b/meta-security/meta-security-isafw/conf/layer.conf
@@ -14,4 +14,4 @@
 
 LAYERDEPENDS_security-isafw = "core"
 
-LAYERSERIES_COMPAT_security-isafw = "kirkstone langdale"
+LAYERSERIES_COMPAT_security-isafw = "langdale mickledore"
diff --git a/meta-security/meta-tpm/conf/layer.conf b/meta-security/meta-tpm/conf/layer.conf
index 1fd2e4c..0dd19b6 100644
--- a/meta-security/meta-tpm/conf/layer.conf
+++ b/meta-security/meta-tpm/conf/layer.conf
@@ -8,7 +8,7 @@
 BBFILE_PATTERN_tpm-layer = "^${LAYERDIR}/"
 BBFILE_PRIORITY_tpm-layer = "10"
 
-LAYERSERIES_COMPAT_tpm-layer = "kirkstone langdale"
+LAYERSERIES_COMPAT_tpm-layer = "langdale mickledore"
 
 LAYERDEPENDS_tpm-layer = " \
     core \
diff --git a/meta-supermicro/conf/layer.conf b/meta-supermicro/conf/layer.conf
index b8df29d..b0525ef 100644
--- a/meta-supermicro/conf/layer.conf
+++ b/meta-supermicro/conf/layer.conf
@@ -8,6 +8,6 @@
 BBFILE_COLLECTIONS += "supermicro"
 BBFILE_PATTERN_supermicro = "^${LAYERDIR}/"
 LAYERVERSION_supermicro = "1"
-LAYERSERIES_COMPAT_supermicro = "kirkstone langdale"
+LAYERSERIES_COMPAT_supermicro = "langdale mickledore"
 LAYERDEPENDS_supermicro = "phosphor-layer"
 
diff --git a/meta-supermicro/meta-x11spi/conf/layer.conf b/meta-supermicro/meta-x11spi/conf/layer.conf
index 2609cab..1c3e331 100644
--- a/meta-supermicro/meta-x11spi/conf/layer.conf
+++ b/meta-supermicro/meta-x11spi/conf/layer.conf
@@ -9,5 +9,5 @@
 BBFILE_PATTERN_x11spi = ""
 
 BBFILE_PRIORITY_x11spi = "5"
-LAYERSERIES_COMPAT_x11spi = "kirkstone langdale"
+LAYERSERIES_COMPAT_x11spi = "langdale mickledore"
 
diff --git a/meta-tyan/conf/layer.conf b/meta-tyan/conf/layer.conf
index 86161c5..5e8294d 100644
--- a/meta-tyan/conf/layer.conf
+++ b/meta-tyan/conf/layer.conf
@@ -7,5 +7,5 @@
 
 BBFILE_COLLECTIONS += "tyan-layer"
 BBFILE_PATTERN_tyan-layer = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_tyan-layer = "kirkstone langdale"
+LAYERSERIES_COMPAT_tyan-layer = "langdale mickledore"
 
diff --git a/meta-tyan/meta-s7106/conf/layer.conf b/meta-tyan/meta-s7106/conf/layer.conf
index 925960e..468501c 100644
--- a/meta-tyan/meta-s7106/conf/layer.conf
+++ b/meta-tyan/meta-s7106/conf/layer.conf
@@ -8,4 +8,4 @@
 BBFILE_COLLECTIONS += "s7106-layer"
 BBFILE_PATTERN_s7106-layer = "^${LAYERDIR}/"
 BBFILE_PRIORITY_s7106-layer = "5"
-LAYERSERIES_COMPAT_s7106-layer = "kirkstone langdale"
+LAYERSERIES_COMPAT_s7106-layer = "langdale mickledore"
diff --git a/meta-tyan/meta-s8036/conf/layer.conf b/meta-tyan/meta-s8036/conf/layer.conf
index ba06c94..9854bc6 100644
--- a/meta-tyan/meta-s8036/conf/layer.conf
+++ b/meta-tyan/meta-s8036/conf/layer.conf
@@ -8,4 +8,4 @@
 BBFILE_COLLECTIONS += "s8036-layer"
 BBFILE_PATTERN_s8036-layer = "^${LAYERDIR}/"
 BBFILE_PRIORITY_s8036-layer = "5"
-LAYERSERIES_COMPAT_s8036-layer = "kirkstone langdale"
+LAYERSERIES_COMPAT_s8036-layer = "langdale mickledore"
diff --git a/meta-wistron/conf/layer.conf b/meta-wistron/conf/layer.conf
index f62cf1b..2ddbf07 100644
--- a/meta-wistron/conf/layer.conf
+++ b/meta-wistron/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "wistron-layer"
 BBFILE_PATTERN_wistron-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_wistron-layer = "kirkstone langdale"
+LAYERSERIES_COMPAT_wistron-layer = "langdale mickledore"
diff --git a/meta-wistron/meta-lannister/conf/layer.conf b/meta-wistron/meta-lannister/conf/layer.conf
index 2eb3c35..f1f1fab 100644
--- a/meta-wistron/meta-lannister/conf/layer.conf
+++ b/meta-wistron/meta-lannister/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "lannister"
 BBFILE_PATTERN_lannister = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_lannister = "kirkstone langdale"
+LAYERSERIES_COMPAT_lannister = "langdale mickledore"
diff --git a/meta-yadro/conf/layer.conf b/meta-yadro/conf/layer.conf
index 252e334..6881044 100644
--- a/meta-yadro/conf/layer.conf
+++ b/meta-yadro/conf/layer.conf
@@ -9,4 +9,4 @@
 BBFILE_PATTERN_yadro-layer = "^${LAYERDIR}/"
 BBFILE_PATTERN_IGNORE_EMPTY_yadro-layer = "1"
 
-LAYERSERIES_COMPAT_yadro-layer = "kirkstone langdale"
+LAYERSERIES_COMPAT_yadro-layer = "langdale mickledore"
diff --git a/meta-yadro/meta-nicole/conf/layer.conf b/meta-yadro/meta-nicole/conf/layer.conf
index 734746f..0665123 100644
--- a/meta-yadro/meta-nicole/conf/layer.conf
+++ b/meta-yadro/meta-nicole/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "nicole-layer"
 BBFILE_PATTERN_nicole-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_nicole-layer = "kirkstone langdale"
+LAYERSERIES_COMPAT_nicole-layer = "langdale mickledore"
diff --git a/meta-yadro/meta-vegman/conf/layer.conf b/meta-yadro/meta-vegman/conf/layer.conf
index 997c9b1..05e9e43 100644
--- a/meta-yadro/meta-vegman/conf/layer.conf
+++ b/meta-yadro/meta-vegman/conf/layer.conf
@@ -8,4 +8,4 @@
 BBFILE_COLLECTIONS += "vegman-layer"
 BBFILE_PATTERN_vegman-layer := "^${LAYERDIR}/"
 
-LAYERSERIES_COMPAT_vegman-layer := "kirkstone langdale"
+LAYERSERIES_COMPAT_vegman-layer := "langdale mickledore"