diff --git a/meta-alibaba/conf/layer.conf b/meta-alibaba/conf/layer.conf
index 435d1dd..715ba51 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 = "gatesgarth hardknott"
+LAYERSERIES_COMPAT_alibaba-layer = "hardknott"
diff --git a/meta-alibaba/meta-thor/conf/layer.conf b/meta-alibaba/meta-thor/conf/layer.conf
index 89eca70..6ae6271 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 = "gatesgarth hardknott"
+LAYERSERIES_COMPAT = "hardknott"
diff --git a/meta-amd/conf/layer.conf b/meta-amd/conf/layer.conf
index 8caa324..7fc59b9 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 = "gatesgarth hardknott"
+LAYERSERIES_COMPAT_amd-layer = "hardknott"
diff --git a/meta-amd/meta-ethanolx/conf/layer.conf b/meta-amd/meta-ethanolx/conf/layer.conf
index 818ab7d..0564fe4 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 = "gatesgarth hardknott"
+LAYERSERIES_COMPAT_ethanolx-layer = "hardknott"
diff --git a/meta-ampere/conf/layer.conf b/meta-ampere/conf/layer.conf
index e1d7fe1..321e2b2 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 = "gatesgarth hardknott honister"
+LAYERSERIES_COMPAT_ampere-layer = "hardknott honister"
diff --git a/meta-ampere/meta-jade/conf/layer.conf b/meta-ampere/meta-jade/conf/layer.conf
index 7b5a07f..f979db1 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 = "gatesgarth hardknott honister"
+LAYERSERIES_COMPAT_jade-layer = "hardknott honister"
diff --git a/meta-arm/conf/layer.conf b/meta-arm/conf/layer.conf
index d111b24..102a0cc 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 = "gatesgarth hardknott"
+LAYERSERIES_COMPAT_arm = "hardknott"
diff --git a/meta-aspeed/conf/layer.conf b/meta-aspeed/conf/layer.conf
index 21b9641..9dd3b72 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 = "gatesgarth hardknott honister"
+LAYERSERIES_COMPAT_aspeed-layer = "hardknott honister"
diff --git a/meta-asrock/conf/layer.conf b/meta-asrock/conf/layer.conf
index 37e452c..4c06d87 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 = "gatesgarth hardknott"
+LAYERSERIES_COMPAT_asrock-layer = "hardknott"
diff --git a/meta-asrock/meta-e3c246d4i/conf/layer.conf b/meta-asrock/meta-e3c246d4i/conf/layer.conf
index aff53c4..6b8e771 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 = "gatesgarth hardknott"
+LAYERSERIES_COMPAT_e3c246d4i-layer = "hardknott"
diff --git a/meta-bytedance/conf/layer.conf b/meta-bytedance/conf/layer.conf
index 241bc6d..9ece82f 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 = "gatesgarth hardknott honister"
+LAYERSERIES_COMPAT_bytedance-layer = "hardknott honister"
diff --git a/meta-bytedance/meta-g220a/conf/layer.conf b/meta-bytedance/meta-g220a/conf/layer.conf
index 4e4f009..e5a5f96 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 = "gatesgarth hardknott honister"
+LAYERSERIES_COMPAT_g220a-layer = "hardknott honister"
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 b3ef55c..277e712 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 = "gatesgarth hardknott honister"
+LAYERSERIES_COMPAT_meta-evb-ast2600 = "hardknott honister"
diff --git a/meta-evb/meta-evb-enclustra/conf/layer.conf b/meta-evb/meta-evb-enclustra/conf/layer.conf
index e83298f..278b6b5 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 = "gatesgarth hardknott honister"
+LAYERSERIES_COMPAT_evb-enclustra = "hardknott honister"
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 ea08f5a..d994413 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 = "gatesgarth hardknott honister"
+LAYERSERIES_COMPAT_evb-zx3-pm3 = "hardknott honister"
diff --git a/meta-evb/meta-evb-nuvoton/conf/layer.conf b/meta-evb/meta-evb-nuvoton/conf/layer.conf
index fe07f91..5c4dfed 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 = "gatesgarth hardknott honister"
+LAYERSERIES_COMPAT_evb-nuvoton = "hardknott honister"
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 8d64d15..543f6a6 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 = "gatesgarth hardknott honister"
+LAYERSERIES_COMPAT_evb-npcm750 = "hardknott honister"
diff --git a/meta-facebook/conf/layer.conf b/meta-facebook/conf/layer.conf
index 895d48f..9e4cf55 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 := "gatesgarth hardknott honister"
+LAYERSERIES_COMPAT_facebook-layer := "hardknott honister"
diff --git a/meta-facebook/meta-bletchley/conf/layer.conf b/meta-facebook/meta-bletchley/conf/layer.conf
index 8e27709..14d3200 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 := "gatesgarth hardknott honister"
+LAYERSERIES_COMPAT_bletchley-layer := "hardknott honister"
diff --git a/meta-facebook/meta-tiogapass/conf/layer.conf b/meta-facebook/meta-tiogapass/conf/layer.conf
index bb8ecee..af34387 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 := "gatesgarth hardknott honister"
+LAYERSERIES_COMPAT_tiogapass-layer := "hardknott honister"
diff --git a/meta-facebook/meta-yosemitev2/conf/layer.conf b/meta-facebook/meta-yosemitev2/conf/layer.conf
index 091cdc3..654ffab 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 := "gatesgarth hardknott honister"
+LAYERSERIES_COMPAT_yosemitev2-layer := "hardknott honister"
diff --git a/meta-google/conf/layer.conf b/meta-google/conf/layer.conf
index 346946b..47379e4 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 = "gatesgarth hardknott honister"
+LAYERSERIES_COMPAT_google-layer = "hardknott honister"
diff --git a/meta-hpe/conf/layer.conf b/meta-hpe/conf/layer.conf
index 6ff79df..2b8f43b 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 = "gatesgarth hardknott"
+LAYERSERIES_COMPAT_hpe-layer = "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 5f85f7c..6e3d5c4 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 = "gatesgarth hardknott"
+LAYERSERIES_COMPAT_dl360poc-layer = "hardknott"
diff --git a/meta-hpe/meta-gxp/conf/layer.conf b/meta-hpe/meta-gxp/conf/layer.conf
index 28f2ddc..4612c22 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 = "gatesgarth hardknott"
+LAYERSERIES_COMPAT_gxp-layer = "hardknott"
 
 GXPBASE = '${@os.path.normpath("${LAYERDIR}/")}'
diff --git a/meta-hxt/conf/layer.conf b/meta-hxt/conf/layer.conf
index bc8cd5b..96be31b 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 = "gatesgarth hardknott"
+LAYERSERIES_COMPAT_hxt = "hardknott"
diff --git a/meta-ibm/conf/layer.conf b/meta-ibm/conf/layer.conf
index 95c571b..5d49c2d 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 = "gatesgarth hardknott honister"
+LAYERSERIES_COMPAT_ibm-layer = "hardknott honister"
diff --git a/meta-ibm/meta-palmetto/conf/layer.conf b/meta-ibm/meta-palmetto/conf/layer.conf
index f40a951..e57b1d5 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 = "gatesgarth hardknott honister"
+LAYERSERIES_COMPAT_palmetto-layer = "hardknott honister"
diff --git a/meta-ibm/meta-romulus/conf/layer.conf b/meta-ibm/meta-romulus/conf/layer.conf
index efeb24a..3651ada 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 = "gatesgarth hardknott honister"
+LAYERSERIES_COMPAT_romulus-layer = "hardknott honister"
diff --git a/meta-ingrasys/conf/layer.conf b/meta-ingrasys/conf/layer.conf
index fc07b59..66d991a 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 = "gatesgarth hardknott honister"
+LAYERSERIES_COMPAT_ingrasys = "hardknott honister"
diff --git a/meta-ingrasys/meta-zaius/conf/layer.conf b/meta-ingrasys/meta-zaius/conf/layer.conf
index 0f930d8..6f62318 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 = "gatesgarth hardknott honister"
+LAYERSERIES_COMPAT_zaius = "hardknott honister"
diff --git a/meta-inspur/conf/layer.conf b/meta-inspur/conf/layer.conf
index 3e91eb5..9e1f53f 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 = "gatesgarth hardknott honister"
+LAYERSERIES_COMPAT_inspur-layer = "hardknott honister"
diff --git a/meta-inspur/meta-fp5280g2/conf/layer.conf b/meta-inspur/meta-fp5280g2/conf/layer.conf
index 99be9a1..f921ba6 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 = "gatesgarth hardknott honister"
+LAYERSERIES_COMPAT_fp5280g2-layer = "hardknott honister"
diff --git a/meta-inspur/meta-on5263m5/conf/layer.conf b/meta-inspur/meta-on5263m5/conf/layer.conf
index f638bcc..2dcf54c 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 = "gatesgarth hardknott honister"
+LAYERSERIES_COMPAT_on5263m5-layer = "hardknott honister"
diff --git a/meta-intel-openbmc/conf/layer.conf b/meta-intel-openbmc/conf/layer.conf
index 3b53a7f..f082caf 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 = "gatesgarth hardknott honister"
+LAYERSERIES_COMPAT_intel = "hardknott honister"
 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 936b1a9..07e7a83 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 = "gatesgarth hardknott honister"
+LAYERSERIES_COMPAT_s2600wf = "hardknott honister"
diff --git a/meta-inventec/conf/layer.conf b/meta-inventec/conf/layer.conf
index 08ca265..2b5eade 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 = "gatesgarth hardknott"
+LAYERSERIES_COMPAT_inventec = "hardknott"
diff --git a/meta-lenovo/conf/layer.conf b/meta-lenovo/conf/layer.conf
index 180e960..0b7cb4f 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 = "gatesgarth hardknott"
+LAYERSERIES_COMPAT_lenovo-layer = "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 9c1b4d6..2c6117c 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 = "gatesgarth hardknott"
+LAYERSERIES_COMPAT_hr630-layer = "hardknott"
diff --git a/meta-lenovo/meta-hr855xg2/conf/layer.conf b/meta-lenovo/meta-hr855xg2/conf/layer.conf
index 3641432..2af2de1 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 = "gatesgarth hardknott"
+LAYERSERIES_COMPAT_hr855xg2-layer = "hardknott"
diff --git a/meta-microsoft/conf/layer.conf b/meta-microsoft/conf/layer.conf
index 03c6d8f..498b391 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 = "gatesgarth hardknott"
+LAYERSERIES_COMPAT_microsoft-layer = "hardknott"
diff --git a/meta-microsoft/meta-olympus/conf/layer.conf b/meta-microsoft/meta-olympus/conf/layer.conf
index 1132bed..db47145 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 = "gatesgarth hardknott"
+LAYERSERIES_COMPAT_olympus-layer = "hardknott"
diff --git a/meta-nuvoton/conf/layer.conf b/meta-nuvoton/conf/layer.conf
index 946ac23..26830d3 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 = "gatesgarth hardknott honister"
+LAYERSERIES_COMPAT_nuvoton-layer = "hardknott honister"
diff --git a/meta-openpower/conf/layer.conf b/meta-openpower/conf/layer.conf
index 4236ab2..9a16ca0 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 = "gatesgarth hardknott honister"
+LAYERSERIES_COMPAT_openpower-layer = "hardknott honister"
diff --git a/meta-phosphor/conf/layer.conf b/meta-phosphor/conf/layer.conf
index 7835456..7e510ea 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 = "gatesgarth hardknott honister"
+LAYERSERIES_COMPAT_phosphor-layer = "hardknott honister"
 
 IMAGE_FEATURES[validitems] += "tools-profile"
 
diff --git a/meta-portwell/meta-neptune/conf/layer.conf b/meta-portwell/meta-neptune/conf/layer.conf
index 3ca3cac..652c8a8 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 = "gatesgarth hardknott"
+LAYERSERIES_COMPAT_neptune = "hardknott"
diff --git a/meta-qualcomm/conf/layer.conf b/meta-qualcomm/conf/layer.conf
index e4c8721..1efa8f6 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 = "gatesgarth hardknott"
+LAYERSERIES_COMPAT_qualcomm = "hardknott"
diff --git a/meta-quanta/conf/layer.conf b/meta-quanta/conf/layer.conf
index 39655f5..a64d93e 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 = "gatesgarth hardknott honister"
+LAYERSERIES_COMPAT_quanta-layer = "hardknott honister"
diff --git a/meta-quanta/meta-f0b/conf/layer.conf b/meta-quanta/meta-f0b/conf/layer.conf
index f29015e..021711a 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 = "gatesgarth hardknott honister"
+LAYERSERIES_COMPAT_f0b-layer = "hardknott honister"
diff --git a/meta-quanta/meta-gbs/conf/layer.conf b/meta-quanta/meta-gbs/conf/layer.conf
index 3f738a0..9f41e05 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 = "gatesgarth hardknott honister"
+LAYERSERIES_COMPAT_gbs-layer = "hardknott honister"
diff --git a/meta-quanta/meta-gsj/conf/layer.conf b/meta-quanta/meta-gsj/conf/layer.conf
index a429102..7591e09 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 = "gatesgarth hardknott honister"
+LAYERSERIES_COMPAT_gsj-layer = "hardknott honister"
diff --git a/meta-quanta/meta-olympus-nuvoton/conf/layer.conf b/meta-quanta/meta-olympus-nuvoton/conf/layer.conf
index c62ff26..e78bf95 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 = "gatesgarth hardknott honister"
+LAYERSERIES_COMPAT_olympus-nuvoton-layer = "hardknott honister"
diff --git a/meta-quanta/meta-q71l/conf/layer.conf b/meta-quanta/meta-q71l/conf/layer.conf
index 98e7146..9919453 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 = "gatesgarth hardknott honister"
+LAYERSERIES_COMPAT_q71l = "hardknott honister"
diff --git a/meta-supermicro/conf/layer.conf b/meta-supermicro/conf/layer.conf
index f46b374..d3943d3 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 := "gatesgarth hardknott"
+LAYERSERIES_COMPAT_supermicro-layer := "hardknott"
 
diff --git a/meta-supermicro/meta-x11spi/conf/layer.conf b/meta-supermicro/meta-x11spi/conf/layer.conf
index d77e82e..83c64e4 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 = "gatesgarth hardknott"
+LAYERSERIES_COMPAT_x11spi = "hardknott"
diff --git a/meta-x86/conf/layer.conf b/meta-x86/conf/layer.conf
index cd42899..aab9a63 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 = "gatesgarth hardknott honister"
+LAYERSERIES_COMPAT_obmc_machines_x86 = "hardknott honister"
diff --git a/meta-yadro/conf/layer.conf b/meta-yadro/conf/layer.conf
index 8d6466f..b291db8 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 = "gatesgarth hardknott honister"
+LAYERSERIES_COMPAT_yadro-layer = "hardknott honister"
diff --git a/meta-yadro/meta-nicole/conf/layer.conf b/meta-yadro/meta-nicole/conf/layer.conf
index fc18b8c..1382027 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 = "gatesgarth hardknott honister"
+LAYERSERIES_COMPAT_nicole-layer = "hardknott honister"