diff --git a/meta-quanta/conf/layer.conf b/meta-quanta/conf/layer.conf
index c461069..9773b5a 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 = "hardknott honister"
+LAYERSERIES_COMPAT_quanta-layer = "honister kirkstone"
 LAYERDEPENDS_quanta-layer = "phosphor-layer"
diff --git a/meta-quanta/meta-f0b/conf/layer.conf b/meta-quanta/meta-f0b/conf/layer.conf
index 021711a..ed048aa 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 = "hardknott honister"
+LAYERSERIES_COMPAT_f0b-layer = "honister kirkstone"
diff --git a/meta-quanta/meta-gbs/conf/layer.conf b/meta-quanta/meta-gbs/conf/layer.conf
index cd2ca1d..6773198 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 = "hardknott honister"
+LAYERSERIES_COMPAT_gbs-layer = "honister kirkstone"
 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 372fb65..4254a7a 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 = "hardknott honister"
+LAYERSERIES_COMPAT_gsj-layer = "honister kirkstone"
 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 e78bf95..0cffd89 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 = "hardknott honister"
+LAYERSERIES_COMPAT_olympus-nuvoton-layer = "honister kirkstone"
diff --git a/meta-quanta/meta-q71l/conf/layer.conf b/meta-quanta/meta-q71l/conf/layer.conf
index 9919453..180d4fa 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 = "hardknott honister"
+LAYERSERIES_COMPAT_q71l = "honister kirkstone"
diff --git a/meta-quanta/meta-s6q/conf/layer.conf b/meta-quanta/meta-s6q/conf/layer.conf
index fe35953..0236823 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 := "hardknott honister"
+LAYERSERIES_COMPAT_s6q-layer := "honister kirkstone"