diff --git a/conf/layer.conf b/conf/layer.conf
index 786b647..7ff4ac1 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "facebook-layer"
 BBFILE_PATTERN_facebook-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_facebook-layer := "warrior zeus dunfell"
+LAYERSERIES_COMPAT_facebook-layer := "zeus dunfell"
diff --git a/meta-tiogapass/conf/layer.conf b/meta-tiogapass/conf/layer.conf
index aeca710..ca0785e 100644
--- a/meta-tiogapass/conf/layer.conf
+++ b/meta-tiogapass/conf/layer.conf
@@ -8,4 +8,4 @@
 BBFILE_COLLECTIONS += "tiogapass-layer"
 BBFILE_PATTERN_tiogapass-layer := "^${LAYERDIR}/"
 
-LAYERSERIES_COMPAT_tiogapass-layer := "warrior zeus dunfell"
+LAYERSERIES_COMPAT_tiogapass-layer := "zeus dunfell"
diff --git a/meta-yosemitev2/conf/layer.conf b/meta-yosemitev2/conf/layer.conf
index 8a759e5..501e86d 100644
--- a/meta-yosemitev2/conf/layer.conf
+++ b/meta-yosemitev2/conf/layer.conf
@@ -8,4 +8,4 @@
 BBFILE_COLLECTIONS += "yosemitev2-layer"
 BBFILE_PATTERN_yosemitev2-layer := "^${LAYERDIR}/"
 
-LAYERSERIES_COMPAT_yosemitev2-layer := "warrior zeus dunfell"
+LAYERSERIES_COMPAT_yosemitev2-layer := "zeus dunfell"