diff --git a/meta-f0b/conf/layer.conf b/meta-f0b/conf/layer.conf
index cfffcf2..05b405f 100644
--- a/meta-f0b/conf/layer.conf
+++ b/meta-f0b/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "f0b-layer"
 BBFILE_PATTERN_f0b-layer = ""
-LAYERSERIES_COMPAT_f0b-layer = "warrior zeus"
+LAYERSERIES_COMPAT_f0b-layer = "dunfell gatesgarth"
diff --git a/meta-gbs/conf/layer.conf b/meta-gbs/conf/layer.conf
index ba7f543..1392596 100644
--- a/meta-gbs/conf/layer.conf
+++ b/meta-gbs/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "gbs-layer"
 BBFILE_PATTERN_gbs-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_gbs-layer = "warrior zeus dunfell"
+LAYERSERIES_COMPAT_gbs-layer = "dunfell gatesgarth"
diff --git a/meta-gsj/conf/layer.conf b/meta-gsj/conf/layer.conf
index a018379..7935f6b 100644
--- a/meta-gsj/conf/layer.conf
+++ b/meta-gsj/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "gsj-layer"
 BBFILE_PATTERN_gsj-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_gsj-layer = "warrior zeus dunfell"
+LAYERSERIES_COMPAT_gsj-layer = "dunfell gatesgarth"
diff --git a/meta-olympus-nuvoton/conf/layer.conf b/meta-olympus-nuvoton/conf/layer.conf
index 28eb35f..6d8da09 100644
--- a/meta-olympus-nuvoton/conf/layer.conf
+++ b/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 = "warrior zeus dunfell"
+LAYERSERIES_COMPAT_olympus-nuvoton-layer = "dunfell gatesgarth"