diff --git a/meta-alibaba/conf/layer.conf b/meta-alibaba/conf/layer.conf
index 430ef5e..435d1dd 100644
--- a/meta-alibaba/conf/layer.conf
+++ b/meta-alibaba/conf/layer.conf
@@ -4,4 +4,4 @@
 
 BBFILE_COLLECTIONS += "alibaba-layer"
 BBFILE_PATTERN_alibaba-layer = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_alibaba-layer = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_alibaba-layer = "gatesgarth hardknott"
diff --git a/meta-alibaba/meta-thor/conf/layer.conf b/meta-alibaba/meta-thor/conf/layer.conf
index 149bdf8..89eca70 100644
--- a/meta-alibaba/meta-thor/conf/layer.conf
+++ b/meta-alibaba/meta-thor/conf/layer.conf
@@ -6,4 +6,4 @@
 
 BBFILE_COLLECTIONS += ""
 BBFILE_PATTERN := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT = "dunfell gatesgarth"
+LAYERSERIES_COMPAT = "gatesgarth hardknott"
diff --git a/meta-amd/conf/layer.conf b/meta-amd/conf/layer.conf
index da41da8..8caa324 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 = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_amd-layer = "gatesgarth hardknott"
diff --git a/meta-amd/meta-ethanolx/conf/layer.conf b/meta-amd/meta-ethanolx/conf/layer.conf
index 22fc7be..818ab7d 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 = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_ethanolx-layer = "gatesgarth hardknott"
diff --git a/meta-ampere/conf/layer.conf b/meta-ampere/conf/layer.conf
index 20fb0b2..800936b 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 = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_ampere-layer = "gatesgarth hardknott"
diff --git a/meta-ampere/meta-jade/conf/layer.conf b/meta-ampere/meta-jade/conf/layer.conf
index 2cf1805..e8abd69 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 = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_jade-layer = "gatesgarth hardknott"
diff --git a/meta-arm/conf/layer.conf b/meta-arm/conf/layer.conf
index d031125..d111b24 100644
--- a/meta-arm/conf/layer.conf
+++ b/meta-arm/conf/layer.conf
@@ -9,4 +9,4 @@
 BBFILE_PATTERN_arm = "^${LAYERDIR}/"
 LAYERVERSION_arm = "1"
 
-LAYERSERIES_COMPAT_arm = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_arm = "gatesgarth hardknott"
diff --git a/meta-aspeed/conf/layer.conf b/meta-aspeed/conf/layer.conf
index 56a2dee..c028975 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 = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_aspeed-layer = "gatesgarth hardknott"
diff --git a/meta-bytedance/conf/layer.conf b/meta-bytedance/conf/layer.conf
index 1f36655..1428987 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 = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_bytedance-layer = "gatesgarth hardknott"
diff --git a/meta-bytedance/meta-g220a/conf/layer.conf b/meta-bytedance/meta-g220a/conf/layer.conf
index 8c075e5..0d28b4a 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 = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_g220a-layer = "gatesgarth hardknott"
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 2a88b8a..75861bf 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 = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_meta-evb-ast2600 = "gatesgarth hardknott"
diff --git a/meta-evb/meta-evb-enclustra/conf/layer.conf b/meta-evb/meta-evb-enclustra/conf/layer.conf
index 9dbc045..35ca2eb 100644
--- a/meta-evb/meta-evb-enclustra/conf/layer.conf
+++ b/meta-evb/meta-evb-enclustra/conf/layer.conf
@@ -3,4 +3,4 @@
 
 BBFILE_COLLECTIONS += "evb-enclustra"
 BBFILE_PATTERN_evb-enclustra = ""
-LAYERSERIES_COMPAT_evb-enclustra = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_evb-enclustra = "gatesgarth hardknott"
diff --git a/meta-evb/meta-evb-enclustra/meta-evb-zx3-pm3/conf/layer.conf b/meta-evb/meta-evb-enclustra/meta-evb-zx3-pm3/conf/layer.conf
index 648a0ba..6cc86c4 100644
--- a/meta-evb/meta-evb-enclustra/meta-evb-zx3-pm3/conf/layer.conf
+++ b/meta-evb/meta-evb-enclustra/meta-evb-zx3-pm3/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "evb-zx3-pm3"
 BBFILE_PATTERN_evb-zx3-pm3 = ""
-LAYERSERIES_COMPAT_evb-zx3-pm3 = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_evb-zx3-pm3 = "gatesgarth hardknott"
diff --git a/meta-evb/meta-evb-nuvoton/conf/layer.conf b/meta-evb/meta-evb-nuvoton/conf/layer.conf
index 52eec49..bdea5d6 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 = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_evb-nuvoton = "gatesgarth hardknott"
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 95fd769..6594515 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 = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_evb-npcm750 = "gatesgarth hardknott"
diff --git a/meta-facebook/conf/layer.conf b/meta-facebook/conf/layer.conf
index aa0e82f..c0ca08f 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 := "dunfell gatesgarth"
+LAYERSERIES_COMPAT_facebook-layer := "gatesgarth hardknott"
diff --git a/meta-facebook/meta-tiogapass/conf/layer.conf b/meta-facebook/meta-tiogapass/conf/layer.conf
index 1ef53db..94db7e1 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 := "dunfell gatesgarth"
+LAYERSERIES_COMPAT_tiogapass-layer := "gatesgarth hardknott"
diff --git a/meta-facebook/meta-yosemitev2/conf/layer.conf b/meta-facebook/meta-yosemitev2/conf/layer.conf
index 4db4415..977d5df 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 := "dunfell gatesgarth"
+LAYERSERIES_COMPAT_yosemitev2-layer := "gatesgarth hardknott"
diff --git a/meta-google/conf/layer.conf b/meta-google/conf/layer.conf
index 24a8480..ed605d1 100644
--- a/meta-google/conf/layer.conf
+++ b/meta-google/conf/layer.conf
@@ -14,4 +14,4 @@
 BBFILE_COLLECTIONS += "google-layer"
 BBFILE_PATTERN_google-layer := "^${LAYERDIR}/"
 LAYERVERSION_google-layer = "1"
-LAYERSERIES_COMPAT_google-layer = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_google-layer = "gatesgarth hardknott"
diff --git a/meta-hpe/conf/layer.conf b/meta-hpe/conf/layer.conf
index 977654c..6ff79df 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}/"
-LAYERSERIES_COMPAT_hpe-layer = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_hpe-layer = "gatesgarth hardknott"
 
 # 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 ef937d3..5f85f7c 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 = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_dl360poc-layer = "gatesgarth hardknott"
diff --git a/meta-hpe/meta-gxp/conf/layer.conf b/meta-hpe/meta-gxp/conf/layer.conf
index af9f8af..28f2ddc 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 = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_gxp-layer = "gatesgarth hardknott"
 
 GXPBASE = '${@os.path.normpath("${LAYERDIR}/")}'
diff --git a/meta-hxt/conf/layer.conf b/meta-hxt/conf/layer.conf
index 5de4403..bc8cd5b 100644
--- a/meta-hxt/conf/layer.conf
+++ b/meta-hxt/conf/layer.conf
@@ -4,4 +4,4 @@
 BBFILE_COLLECTIONS += "hxt"
 BBFILE_PATTERN_hxt = ""
 
-LAYERSERIES_COMPAT_hxt = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_hxt = "gatesgarth hardknott"
diff --git a/meta-ibm/conf/layer.conf b/meta-ibm/conf/layer.conf
index 8662448..e8824c8 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 = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_ibm-layer = "gatesgarth hardknott"
diff --git a/meta-ibm/meta-palmetto/conf/layer.conf b/meta-ibm/meta-palmetto/conf/layer.conf
index 724670d..9f2df63 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 = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_palmetto-layer = "gatesgarth hardknott"
diff --git a/meta-ibm/meta-romulus/conf/layer.conf b/meta-ibm/meta-romulus/conf/layer.conf
index 4ca0ead..2c176f4 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 = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_romulus-layer = "gatesgarth hardknott"
diff --git a/meta-ingrasys/conf/layer.conf b/meta-ingrasys/conf/layer.conf
index 1c9165c..18a1bfa 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 = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_ingrasys = "gatesgarth hardknott"
diff --git a/meta-ingrasys/meta-zaius/conf/layer.conf b/meta-ingrasys/meta-zaius/conf/layer.conf
index 92c5de5..d63eb76 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 = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_zaius = "gatesgarth hardknott"
diff --git a/meta-inspur/conf/layer.conf b/meta-inspur/conf/layer.conf
index ca10a79..14a32e9 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 = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_inspur-layer = "gatesgarth hardknott"
diff --git a/meta-inspur/meta-fp5280g2/conf/layer.conf b/meta-inspur/meta-fp5280g2/conf/layer.conf
index 63ebcb8..18e6518 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 = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_fp5280g2-layer = "gatesgarth hardknott"
diff --git a/meta-inspur/meta-on5263m5/conf/layer.conf b/meta-inspur/meta-on5263m5/conf/layer.conf
index fe5d156..59a0a8a 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 = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_on5263m5-layer = "gatesgarth hardknott"
diff --git a/meta-intel-openbmc/conf/layer.conf b/meta-intel-openbmc/conf/layer.conf
index e515b5f..e2133be 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 = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_intel = "gatesgarth hardknott"
 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 c5001be..82a9da0 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 = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_s2600wf = "gatesgarth hardknott"
diff --git a/meta-inventec/conf/layer.conf b/meta-inventec/conf/layer.conf
index f46b3e2..08ca265 100644
--- a/meta-inventec/conf/layer.conf
+++ b/meta-inventec/conf/layer.conf
@@ -4,4 +4,4 @@
 BBFILE_COLLECTIONS += "inventec"
 BBFILE_PATTERN_inventec = ""
 
-LAYERSERIES_COMPAT_inventec = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_inventec = "gatesgarth hardknott"
diff --git a/meta-lenovo/conf/layer.conf b/meta-lenovo/conf/layer.conf
index b18d1ea..180e960 100644
--- a/meta-lenovo/conf/layer.conf
+++ b/meta-lenovo/conf/layer.conf
@@ -12,7 +12,7 @@
 BBFILE_COLLECTIONS += "lenovo-layer"
 BBFILE_PATTERN_lenovo-layer = ""
 LAYERVERSION_lenovo-layer = "1"
-LAYERSERIES_COMPAT_lenovo-layer = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_lenovo-layer = "gatesgarth hardknott"
 
 # Provide a variable that points the base of the lenovo layer.
 LENOVOBASE = '${@os.path.normpath("${LAYERDIR}/")}'
diff --git a/meta-lenovo/meta-hr630/conf/layer.conf b/meta-lenovo/meta-hr630/conf/layer.conf
index 58bf526..9c1b4d6 100644
--- a/meta-lenovo/meta-hr630/conf/layer.conf
+++ b/meta-lenovo/meta-hr630/conf/layer.conf
@@ -11,4 +11,4 @@
 BBFILE_COLLECTIONS += "hr630-layer"
 BBFILE_PATTERN_hr630-layer = ""
 BBFILE_PRIORITY_hr630-layer = "5"
-LAYERSERIES_COMPAT_hr630-layer = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_hr630-layer = "gatesgarth hardknott"
diff --git a/meta-lenovo/meta-hr855xg2/conf/layer.conf b/meta-lenovo/meta-hr855xg2/conf/layer.conf
index 8402ee9..3641432 100644
--- a/meta-lenovo/meta-hr855xg2/conf/layer.conf
+++ b/meta-lenovo/meta-hr855xg2/conf/layer.conf
@@ -11,4 +11,4 @@
 BBFILE_COLLECTIONS += "hr855xg2-layer"
 BBFILE_PATTERN_hr855xg2-layer := "^${LAYERDIR}/"
 BBFILE_PRIORITY_hr855xg2-layer = "5"
-LAYERSERIES_COMPAT_hr855xg2-layer = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_hr855xg2-layer = "gatesgarth hardknott"
diff --git a/meta-microsoft/conf/layer.conf b/meta-microsoft/conf/layer.conf
index aa3cd78..03c6d8f 100755
--- a/meta-microsoft/conf/layer.conf
+++ b/meta-microsoft/conf/layer.conf
@@ -3,4 +3,4 @@
 
 BBFILE_COLLECTIONS += "microsoft-layer"
 BBFILE_PATTERN_microsoft-layer = ""
-LAYERSERIES_COMPAT_microsoft-layer = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_microsoft-layer = "gatesgarth hardknott"
diff --git a/meta-microsoft/meta-olympus/conf/layer.conf b/meta-microsoft/meta-olympus/conf/layer.conf
index 2a58334..1132bed 100755
--- a/meta-microsoft/meta-olympus/conf/layer.conf
+++ b/meta-microsoft/meta-olympus/conf/layer.conf
@@ -9,4 +9,4 @@
 BBFILE_PATTERN_olympus-layer = "^${LAYERDIR}/"
 BBFILE_PRIORITY_olympus-layer = "6"
 
-LAYERSERIES_COMPAT_olympus-layer = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_olympus-layer = "gatesgarth hardknott"
diff --git a/meta-nuvoton/conf/layer.conf b/meta-nuvoton/conf/layer.conf
index eaf9a52..15d4b97 100644
--- a/meta-nuvoton/conf/layer.conf
+++ b/meta-nuvoton/conf/layer.conf
@@ -7,4 +7,4 @@
 BBFILE_COLLECTIONS += "nuvoton-layer"
 BBFILE_PATTERN_nuvoton-layer = ""
 LAYERVERSION_nuvoton-layer = "1"
-LAYERSERIES_COMPAT_nuvoton-layer = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_nuvoton-layer = "gatesgarth hardknott"
diff --git a/meta-openpower/conf/layer.conf b/meta-openpower/conf/layer.conf
index 57e0925..6e7d573 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 = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_openpower-layer = "gatesgarth hardknott"
diff --git a/meta-phosphor/conf/layer.conf b/meta-phosphor/conf/layer.conf
index 2292acc..f651b2d 100644
--- a/meta-phosphor/conf/layer.conf
+++ b/meta-phosphor/conf/layer.conf
@@ -8,7 +8,7 @@
 BBFILE_COLLECTIONS += "phosphor-layer"
 BBFILE_PATTERN_phosphor-layer := "^${LAYERDIR}/"
 LAYERVERSION_phosphor-layer = "1"
-LAYERSERIES_COMPAT_phosphor-layer = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_phosphor-layer = "gatesgarth hardknott"
 
 IMAGE_FEATURES[validitems] += "tools-profile"
 
diff --git a/meta-portwell/meta-neptune/conf/layer.conf b/meta-portwell/meta-neptune/conf/layer.conf
index 4addb78..3ca3cac 100644
--- a/meta-portwell/meta-neptune/conf/layer.conf
+++ b/meta-portwell/meta-neptune/conf/layer.conf
@@ -8,4 +8,4 @@
 BBFILE_COLLECTIONS += "neptune"
 BBFILE_PATTERN_neptune = ""
 
-LAYERSERIES_COMPAT_neptune = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_neptune = "gatesgarth hardknott"
diff --git a/meta-qualcomm/conf/layer.conf b/meta-qualcomm/conf/layer.conf
index 6b1ea78..e4c8721 100644
--- a/meta-qualcomm/conf/layer.conf
+++ b/meta-qualcomm/conf/layer.conf
@@ -4,4 +4,4 @@
 BBFILE_COLLECTIONS += "qualcomm"
 BBFILE_PATTERN_qualcomm = ""
 
-LAYERSERIES_COMPAT_qualcomm = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_qualcomm = "gatesgarth hardknott"
diff --git a/meta-quanta/conf/layer.conf b/meta-quanta/conf/layer.conf
index 8db4bd2..5ab3e26 100644
--- a/meta-quanta/conf/layer.conf
+++ b/meta-quanta/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "quanta-layer"
 BBFILE_PATTERN_quanta-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_quanta-layer = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_quanta-layer = "gatesgarth hardknott"
diff --git a/meta-quanta/meta-f0b/conf/layer.conf b/meta-quanta/meta-f0b/conf/layer.conf
index 05b405f..fc0a1a7 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 = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_f0b-layer = "gatesgarth hardknott"
diff --git a/meta-quanta/meta-gbs/conf/layer.conf b/meta-quanta/meta-gbs/conf/layer.conf
index 1392596..ec03a3a 100644
--- a/meta-quanta/meta-gbs/conf/layer.conf
+++ b/meta-quanta/meta-gbs/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "gbs-layer"
 BBFILE_PATTERN_gbs-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_gbs-layer = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_gbs-layer = "gatesgarth hardknott"
diff --git a/meta-quanta/meta-gsj/conf/layer.conf b/meta-quanta/meta-gsj/conf/layer.conf
index 7935f6b..9bb6718 100644
--- a/meta-quanta/meta-gsj/conf/layer.conf
+++ b/meta-quanta/meta-gsj/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "gsj-layer"
 BBFILE_PATTERN_gsj-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_gsj-layer = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_gsj-layer = "gatesgarth hardknott"
diff --git a/meta-quanta/meta-olympus-nuvoton/conf/layer.conf b/meta-quanta/meta-olympus-nuvoton/conf/layer.conf
index 6d8da09..0c2366e 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 = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_olympus-nuvoton-layer = "gatesgarth hardknott"
diff --git a/meta-supermicro/conf/layer.conf b/meta-supermicro/conf/layer.conf
index 23b7406..f46b374 100644
--- a/meta-supermicro/conf/layer.conf
+++ b/meta-supermicro/conf/layer.conf
@@ -7,5 +7,5 @@
 
 BBFILE_COLLECTIONS += "supermicro-layer"
 BBFILE_PATTERN_supermicro-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_supermicro-layer := "dunfell gatesgarth"
+LAYERSERIES_COMPAT_supermicro-layer := "gatesgarth hardknott"
 
diff --git a/meta-supermicro/meta-x11spi/conf/layer.conf b/meta-supermicro/meta-x11spi/conf/layer.conf
index 86e0a91..d77e82e 100644
--- a/meta-supermicro/meta-x11spi/conf/layer.conf
+++ b/meta-supermicro/meta-x11spi/conf/layer.conf
@@ -8,4 +8,4 @@
 BBFILE_COLLECTIONS += "x11spi"
 BBFILE_PATTERN_x11spi = ""
 
-LAYERSERIES_COMPAT_x11spi = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_x11spi = "gatesgarth hardknott"
diff --git a/meta-x86/conf/layer.conf b/meta-x86/conf/layer.conf
index d10e210..93bc497 100644
--- a/meta-x86/conf/layer.conf
+++ b/meta-x86/conf/layer.conf
@@ -3,4 +3,4 @@
 
 BBFILE_COLLECTIONS += "obmc_machines_x86"
 BBFILE_PATTERN_obmc_machines_x86 = ""
-LAYERSERIES_COMPAT_obmc_machines_x86 = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_obmc_machines_x86 = "gatesgarth hardknott"
diff --git a/meta-yadro/conf/layer.conf b/meta-yadro/conf/layer.conf
index 502a8fd..69a297d 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 = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_yadro-layer = "gatesgarth hardknott"
diff --git a/meta-yadro/meta-nicole/conf/layer.conf b/meta-yadro/meta-nicole/conf/layer.conf
index 6bb50b7..5159fc9 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 = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_nicole-layer = "gatesgarth hardknott"
diff --git a/meta-yadro/meta-vesnin/conf/layer.conf b/meta-yadro/meta-vesnin/conf/layer.conf
index ed65950..47ce75e 100644
--- a/meta-yadro/meta-vesnin/conf/layer.conf
+++ b/meta-yadro/meta-vesnin/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "vesnin-layer"
 BBFILE_PATTERN_vesnin-layer = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_vesnin-layer = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_vesnin-layer = "gatesgarth hardknott"