diff --git a/deliverables/zed/python-saharaclient.yaml b/deliverables/zed/python-saharaclient.yaml
index bf958cd222..66cec527f3 100644
--- a/deliverables/zed/python-saharaclient.yaml
+++ b/deliverables/zed/python-saharaclient.yaml
@@ -19,6 +19,12 @@ releases:
     projects:
       - repo: openstack/python-saharaclient
         hash: d0c0eb588c4505a7ea0652ab2c45b73c459820a6
+  - version: zed-eom
+    projects:
+      - repo: openstack/python-saharaclient
+        hash: 9c094d74c881443ff1912b3bf15395c47a11f7cc
 branches:
   - name: stable/zed
     location: 4.0.2
+  - name: unmaintained/zed
+    location: zed-eom
diff --git a/deliverables/zed/sahara-dashboard.yaml b/deliverables/zed/sahara-dashboard.yaml
index 28f7599904..5a80cec195 100644
--- a/deliverables/zed/sahara-dashboard.yaml
+++ b/deliverables/zed/sahara-dashboard.yaml
@@ -15,7 +15,13 @@ releases:
       - repo: openstack/sahara-dashboard
         hash: 0c57fd76c4c39efc1510df5aaceb22fcaa9e24ad
     diff-start: 16.0.0
+  - version: zed-eom
+    projects:
+      - repo: openstack/sahara-dashboard
+        hash: 79bddab879b92b1b5019d878dae036beacdbbfa3
 branches:
   - name: stable/zed
     location: 17.0.0.0rc1
+  - name: unmaintained/zed
+    location: zed-eom
 release-notes: https://docs.openstack.org/releasenotes/sahara-dashboard/zed.html
diff --git a/deliverables/zed/sahara-extra.yaml b/deliverables/zed/sahara-extra.yaml
index a7224f5df5..53bf119a5b 100644
--- a/deliverables/zed/sahara-extra.yaml
+++ b/deliverables/zed/sahara-extra.yaml
@@ -15,6 +15,12 @@ releases:
       - repo: openstack/sahara-extra
         hash: cf5762829e5ac2f348d793f950f72dc234ce785e
     diff-start: ussuri-em
+  - version: zed-eom
+    projects:
+      - repo: openstack/sahara-extra
+        hash: cf5762829e5ac2f348d793f950f72dc234ce785e
 branches:
   - name: stable/zed
     location: 16.0.0.0rc1
+  - name: unmaintained/zed
+    location: zed-eom
diff --git a/deliverables/zed/sahara-image-elements.yaml b/deliverables/zed/sahara-image-elements.yaml
index 519e8548d5..00643cbffa 100644
--- a/deliverables/zed/sahara-image-elements.yaml
+++ b/deliverables/zed/sahara-image-elements.yaml
@@ -16,6 +16,12 @@ releases:
       - repo: openstack/sahara-image-elements
         hash: 008b0d7e83bb75d89fed85db0a4a422519fd246b
     diff-start: victoria-em
+  - version: zed-eom
+    projects:
+      - repo: openstack/sahara-image-elements
+        hash: c6ac80e71ec7755099598bd7cb283a6b49db8125
 branches:
   - name: stable/zed
     location: 17.0.0.0rc1
+  - name: unmaintained/zed
+    location: zed-eom
diff --git a/deliverables/zed/sahara-plugin-ambari.yaml b/deliverables/zed/sahara-plugin-ambari.yaml
index fef414f441..d066b56622 100644
--- a/deliverables/zed/sahara-plugin-ambari.yaml
+++ b/deliverables/zed/sahara-plugin-ambari.yaml
@@ -15,7 +15,14 @@ releases:
       - repo: openstack/sahara-plugin-ambari
         hash: e52bcb6626408d522b15dbd5bbe1d457e04e8173
     diff-start: 7.0.0
+  - version: zed-eom
+    projects:
+      - repo: openstack/sahara-plugin-ambari
+        hash: 1b900178ee53ead16816c15c0e85d604ec4394ce
 branches:
   - name: stable/zed
     location: 8.0.0.0rc1
-release-notes: https://docs.openstack.org/releasenotes/sahara-plugin-ambari/zed.html
+  - name: unmaintained/zed
+    location: zed-eom
+release-notes:
+  https://docs.openstack.org/releasenotes/sahara-plugin-ambari/zed.html
diff --git a/deliverables/zed/sahara-plugin-cdh.yaml b/deliverables/zed/sahara-plugin-cdh.yaml
index cdd4a57ec2..7700a1ef1a 100644
--- a/deliverables/zed/sahara-plugin-cdh.yaml
+++ b/deliverables/zed/sahara-plugin-cdh.yaml
@@ -15,7 +15,13 @@ releases:
       - repo: openstack/sahara-plugin-cdh
         hash: 8f8e9fde6c371dd68954695c67bf91121d71076c
     diff-start: 7.0.0
+  - version: zed-eom
+    projects:
+      - repo: openstack/sahara-plugin-cdh
+        hash: 35cf0bca5a39a18596280fa60d1a0ad101fd05b6
 branches:
   - name: stable/zed
     location: 8.0.0.0rc1
+  - name: unmaintained/zed
+    location: zed-eom
 release-notes: https://docs.openstack.org/releasenotes/sahara-plugin-cdh/zed.html
diff --git a/deliverables/zed/sahara-plugin-mapr.yaml b/deliverables/zed/sahara-plugin-mapr.yaml
index bf8c4cfd38..86425234b1 100644
--- a/deliverables/zed/sahara-plugin-mapr.yaml
+++ b/deliverables/zed/sahara-plugin-mapr.yaml
@@ -15,7 +15,14 @@ releases:
       - repo: openstack/sahara-plugin-mapr
         hash: ddbce89c8ba8d2b5cf9ebdd2a9a637775d8bee3e
     diff-start: 7.0.0
+  - version: zed-eom
+    projects:
+      - repo: openstack/sahara-plugin-mapr
+        hash: 5d7cf1ccaf5a7f3b59e5a7f16fa32fe89a0d7a35
 branches:
   - name: stable/zed
     location: 8.0.0.0rc1
-release-notes: https://docs.openstack.org/releasenotes/sahara-plugin-mapr/zed.html
+  - name: unmaintained/zed
+    location: zed-eom
+release-notes:
+  https://docs.openstack.org/releasenotes/sahara-plugin-mapr/zed.html
diff --git a/deliverables/zed/sahara-plugin-spark.yaml b/deliverables/zed/sahara-plugin-spark.yaml
index 0c2b0e6250..3a7a1a5412 100644
--- a/deliverables/zed/sahara-plugin-spark.yaml
+++ b/deliverables/zed/sahara-plugin-spark.yaml
@@ -15,7 +15,14 @@ releases:
       - repo: openstack/sahara-plugin-spark
         hash: 4999d4c3f24b8e77e9a4766fc07e2f2a321c32da
     diff-start: 8.0.0.0rc1
+  - version: zed-eom
+    projects:
+      - repo: openstack/sahara-plugin-spark
+        hash: 4999d4c3f24b8e77e9a4766fc07e2f2a321c32da
 branches:
   - name: stable/zed
     location: 8.0.0.0rc1
-release-notes: https://docs.openstack.org/releasenotes/sahara-plugin-spark/zed.html
+  - name: unmaintained/zed
+    location: zed-eom
+release-notes:
+  https://docs.openstack.org/releasenotes/sahara-plugin-spark/zed.html
diff --git a/deliverables/zed/sahara-plugin-storm.yaml b/deliverables/zed/sahara-plugin-storm.yaml
index a3d89f319d..3b00efd182 100644
--- a/deliverables/zed/sahara-plugin-storm.yaml
+++ b/deliverables/zed/sahara-plugin-storm.yaml
@@ -15,6 +15,12 @@ releases:
       - repo: openstack/sahara-plugin-storm
         hash: ae96409b4001c64e5e07e72e72737b9178a3cce4
     diff-start: 7.0.0
+  - version: zed-eom
+    projects:
+      - repo: openstack/sahara-plugin-storm
+        hash: ae96409b4001c64e5e07e72e72737b9178a3cce4
 branches:
   - name: stable/zed
     location: 8.0.0.0rc1
+  - name: unmaintained/zed
+    location: zed-eom
diff --git a/deliverables/zed/sahara-plugin-vanilla.yaml b/deliverables/zed/sahara-plugin-vanilla.yaml
index 760131d102..788db83bd9 100644
--- a/deliverables/zed/sahara-plugin-vanilla.yaml
+++ b/deliverables/zed/sahara-plugin-vanilla.yaml
@@ -15,6 +15,12 @@ releases:
       - repo: openstack/sahara-plugin-vanilla
         hash: 6cd493d42097a092ef133338a09835ea6158c7e7
     diff-start: 7.0.0
+  - version: zed-eom
+    projects:
+      - repo: openstack/sahara-plugin-vanilla
+        hash: 6cd493d42097a092ef133338a09835ea6158c7e7
 branches:
   - name: stable/zed
     location: 8.0.0.0rc1
+  - name: unmaintained/zed
+    location: zed-eom
diff --git a/deliverables/zed/sahara.yaml b/deliverables/zed/sahara.yaml
index af7fcbec7c..40c20cd44e 100644
--- a/deliverables/zed/sahara.yaml
+++ b/deliverables/zed/sahara.yaml
@@ -16,7 +16,13 @@ releases:
       - repo: openstack/sahara
         hash: c943f4a510a0f022ebce8364c2bc2e6fa23b3cf7
     diff-start: 16.0.0.0rc1
+  - version: zed-eom
+    projects:
+      - repo: openstack/sahara
+        hash: 9a8ced98cbb1f93fde69749ebbe120bb95509460
 branches:
   - name: stable/zed
     location: 17.0.0.0rc1
+  - name: unmaintained/zed
+    location: zed-eom
 release-notes: https://docs.openstack.org/releasenotes/sahara/zed.html