diff --git a/deliverables/victoria/cinder.yaml b/deliverables/victoria/cinder.yaml
index 59eb5e3a08..3593cfc230 100644
--- a/deliverables/victoria/cinder.yaml
+++ b/deliverables/victoria/cinder.yaml
@@ -52,7 +52,13 @@ releases:
     projects:
       - repo: openstack/cinder
         hash: 3aa3968342ff16fba8e4426f5301f670aa72fc51
+  - version: victoria-eom
+    projects:
+      - repo: openstack/cinder
+        hash: ed500fc9a3adca11ed2d184b78f35ac2133ada44
 branches:
   - name: stable/victoria
     location: 17.0.0.0rc1
+  - name: unmaintained/victoria
+    location: victoria-eom
 release-notes: https://docs.openstack.org/releasenotes/cinder/victoria.html
diff --git a/deliverables/victoria/cinderlib.yaml b/deliverables/victoria/cinderlib.yaml
index e1ee0eafe7..a4c4ed977b 100644
--- a/deliverables/victoria/cinderlib.yaml
+++ b/deliverables/victoria/cinderlib.yaml
@@ -8,6 +8,8 @@ repository-settings:
 branches:
   - location: 3.0.0
     name: stable/victoria
+  - name: unmaintained/victoria
+    location: victoria-eom
 releases:
   - version: 3.0.0
     projects:
@@ -21,4 +23,8 @@ releases:
     projects:
       - repo: openstack/cinderlib
         hash: afd28b9875f15416a1340c4c95cdf46c8c6bfcae
+  - version: victoria-eom
+    projects:
+      - repo: openstack/cinderlib
+        hash: dcf2a4b5e567acdff2f36dc154d20721062d2898
 release-notes: https://docs.openstack.org/releasenotes/cinderlib/victoria.html
diff --git a/deliverables/victoria/os-brick.yaml b/deliverables/victoria/os-brick.yaml
index 9a8b97e5df..34406c50e0 100644
--- a/deliverables/victoria/os-brick.yaml
+++ b/deliverables/victoria/os-brick.yaml
@@ -47,7 +47,13 @@ releases:
     projects:
       - repo: openstack/os-brick
         hash: ffe0cbfc93e9d1ebe03a63976cd20e23c02aaeb4
+  - version: victoria-eom
+    projects:
+      - repo: openstack/os-brick
+        hash: 78a0ea24a586139343c98821f9914901f1b5ec5b
 branches:
   - location: 4.0.0
     name: stable/victoria
+  - name: unmaintained/victoria
+    location: victoria-eom
 release-notes: https://docs.openstack.org/releasenotes/os-brick/victoria.html
diff --git a/deliverables/victoria/python-brick-cinderclient-ext.yaml b/deliverables/victoria/python-brick-cinderclient-ext.yaml
index 4660814f39..91cd0973fe 100644
--- a/deliverables/victoria/python-brick-cinderclient-ext.yaml
+++ b/deliverables/victoria/python-brick-cinderclient-ext.yaml
@@ -23,7 +23,14 @@ releases:
     projects:
       - repo: openstack/python-brick-cinderclient-ext
         hash: b2e33001c5cdd2ce28c89bdb14e7c169d016915d
+  - version: victoria-eom
+    projects:
+      - repo: openstack/python-brick-cinderclient-ext
+        hash: 6eeacc0523dacea0ebbb66be30329ee6e83d862f
 branches:
   - name: stable/victoria
     location: 1.1.1
-release-notes: https://docs.openstack.org/releasenotes/python-brick-cinderclient-ext/victoria.html
+  - name: unmaintained/victoria
+    location: victoria-eom
+release-notes:
+  https://docs.openstack.org/releasenotes/python-brick-cinderclient-ext/victoria.html
diff --git a/deliverables/victoria/python-cinderclient.yaml b/deliverables/victoria/python-cinderclient.yaml
index ca917f048a..e8e2662e66 100644
--- a/deliverables/victoria/python-cinderclient.yaml
+++ b/deliverables/victoria/python-cinderclient.yaml
@@ -27,7 +27,14 @@ releases:
     projects:
       - repo: openstack/python-cinderclient
         hash: 1d34f5479affb8a2c777bb61baa178891d08084c
+  - version: victoria-eom
+    projects:
+      - repo: openstack/python-cinderclient
+        hash: 3bc7349bc545d8f5a3299aa4faa046630334482c
 branches:
   - name: stable/victoria
     location: 7.2.0
-release-notes: https://docs.openstack.org/releasenotes/python-cinderclient/victoria.html
+  - name: unmaintained/victoria
+    location: victoria-eom
+release-notes:
+  https://docs.openstack.org/releasenotes/python-cinderclient/victoria.html
diff --git a/deliverables/wallaby/cinder.yaml b/deliverables/wallaby/cinder.yaml
index 433c47d723..de72d253f4 100644
--- a/deliverables/wallaby/cinder.yaml
+++ b/deliverables/wallaby/cinder.yaml
@@ -52,7 +52,13 @@ releases:
     projects:
       - repo: openstack/cinder
         hash: ebc27d371450dccbba49443ab9094484a4f9905c
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/cinder
+        hash: f6b44fc201c3e679d70367fd588304d7a8cbf420
 branches:
   - name: stable/wallaby
     location: 18.0.0.0rc1
+  - name: unmaintained/wallaby
+    location: wallaby-eom
 release-notes: https://docs.openstack.org/releasenotes/cinder/wallaby.html
diff --git a/deliverables/wallaby/cinderlib.yaml b/deliverables/wallaby/cinderlib.yaml
index 1276de1c65..b5c8c88e24 100644
--- a/deliverables/wallaby/cinderlib.yaml
+++ b/deliverables/wallaby/cinderlib.yaml
@@ -14,7 +14,13 @@ releases:
     projects:
       - repo: openstack/cinderlib
         hash: 51609b61a43d53119c8e8e00ae5ef5e919e85a27
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/cinderlib
+        hash: 03441bf1baef2f99fe1a6c754f9098e58fd9f54d
 branches:
   - location: 4.0.0
     name: stable/wallaby
+  - name: unmaintained/wallaby
+    location: wallaby-eom
 release-notes: https://docs.openstack.org/releasenotes/cinderlib/wallaby.html
diff --git a/deliverables/wallaby/os-brick.yaml b/deliverables/wallaby/os-brick.yaml
index fd7f33204c..d571770576 100644
--- a/deliverables/wallaby/os-brick.yaml
+++ b/deliverables/wallaby/os-brick.yaml
@@ -39,7 +39,13 @@ releases:
     projects:
       - repo: openstack/os-brick
         hash: cf69f9247061bd0a945a6fb6bf688acff617eb2c
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/os-brick
+        hash: 5dcda6b961fa765c817f94a782a6fff48295c89a
 branches:
   - location: 4.3.0
     name: stable/wallaby
+  - name: unmaintained/wallaby
+    location: wallaby-eom
 release-notes: https://docs.openstack.org/releasenotes/os-brick/wallaby.html
diff --git a/deliverables/wallaby/python-brick-cinderclient-ext.yaml b/deliverables/wallaby/python-brick-cinderclient-ext.yaml
index 73a93089ac..2df7677fa6 100644
--- a/deliverables/wallaby/python-brick-cinderclient-ext.yaml
+++ b/deliverables/wallaby/python-brick-cinderclient-ext.yaml
@@ -15,7 +15,14 @@ releases:
     projects:
       - repo: openstack/python-brick-cinderclient-ext
         hash: e008ceef79e9424357b2cf63f86a0783399687c2
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/python-brick-cinderclient-ext
+        hash: 46d2f173ef54f571dc0770a17bb1bac0e9ef87de
 branches:
   - name: stable/wallaby
     location: 1.3.0
-release-notes: https://docs.openstack.org/releasenotes/python-brick-cinderclient-ext/wallaby.html
+  - name: unmaintained/wallaby
+    location: wallaby-eom
+release-notes:
+  https://docs.openstack.org/releasenotes/python-brick-cinderclient-ext/wallaby.html
diff --git a/deliverables/wallaby/python-cinderclient.yaml b/deliverables/wallaby/python-cinderclient.yaml
index 8307a5e224..d6103099c9 100644
--- a/deliverables/wallaby/python-cinderclient.yaml
+++ b/deliverables/wallaby/python-cinderclient.yaml
@@ -23,7 +23,14 @@ releases:
     projects:
       - repo: openstack/python-cinderclient
         hash: 4f72e6f0c218751d28c8442d401e2fd2abcec1ea
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/python-cinderclient
+        hash: 3d309b785ad7a58fb13176d1a9b9770afb36c238
 branches:
   - name: stable/wallaby
     location: 7.4.0
-release-notes: https://docs.openstack.org/releasenotes/python-cinderclient/wallaby.html
+  - name: unmaintained/wallaby
+    location: wallaby-eom
+release-notes:
+  https://docs.openstack.org/releasenotes/python-cinderclient/wallaby.html
diff --git a/deliverables/xena/cinder.yaml b/deliverables/xena/cinder.yaml
index 00a663f1d9..67fc91ab05 100644
--- a/deliverables/xena/cinder.yaml
+++ b/deliverables/xena/cinder.yaml
@@ -71,7 +71,13 @@ releases:
     projects:
       - repo: openstack/cinder
         hash: cd172e5dad8e866293f88c3f25c8e182175fd903
+  - version: xena-eom
+    projects:
+      - repo: openstack/cinder
+        hash: f8ea857720addd986dd50432d49880c36ae1fd54
 branches:
   - name: stable/xena
     location: 19.0.0.0rc1
+  - name: unmaintained/xena
+    location: xena-eom
 release-notes: https://docs.openstack.org/releasenotes/cinder/xena.html
diff --git a/deliverables/xena/cinderlib.yaml b/deliverables/xena/cinderlib.yaml
index 519bd19d63..e6c0b24511 100644
--- a/deliverables/xena/cinderlib.yaml
+++ b/deliverables/xena/cinderlib.yaml
@@ -14,7 +14,13 @@ releases:
     projects:
       - repo: openstack/cinderlib
         hash: e13887ec984603fe2b3b43668bfc6eac121c2cfd
+  - version: xena-eom
+    projects:
+      - repo: openstack/cinderlib
+        hash: 9f83b47cdcd80a5e1e53770bacb70b16636090a3
 branches:
   - name: stable/xena
     location: 4.1.0
+  - name: unmaintained/xena
+    location: xena-eom
 release-notes: https://docs.openstack.org/releasenotes/cinderlib/xena.html
diff --git a/deliverables/xena/os-brick.yaml b/deliverables/xena/os-brick.yaml
index 95b3c2b45e..3d133f2968 100644
--- a/deliverables/xena/os-brick.yaml
+++ b/deliverables/xena/os-brick.yaml
@@ -31,7 +31,13 @@ releases:
     projects:
       - repo: openstack/os-brick
         hash: 3aa5d295821d6bb39a24f465b740f9ac4fb884d1
+  - version: xena-eom
+    projects:
+      - repo: openstack/os-brick
+        hash: 70493735d2f99523c4a23ecbeed15969b2e81f6b
 branches:
   - location: 5.0.0
     name: stable/xena
+  - name: unmaintained/xena
+    location: xena-eom
 release-notes: https://docs.openstack.org/releasenotes/os-brick/xena.html
diff --git a/deliverables/xena/python-brick-cinderclient-ext.yaml b/deliverables/xena/python-brick-cinderclient-ext.yaml
index 9f2c4f06b3..deaab95c37 100644
--- a/deliverables/xena/python-brick-cinderclient-ext.yaml
+++ b/deliverables/xena/python-brick-cinderclient-ext.yaml
@@ -15,7 +15,14 @@ releases:
     projects:
       - repo: openstack/python-brick-cinderclient-ext
         hash: 0a5b1f76aa3b9905a4197263174ab31b301a4787
+  - version: xena-eom
+    projects:
+      - repo: openstack/python-brick-cinderclient-ext
+        hash: 549a624377020eee0737fb992139e169a519fd4c
 branches:
   - location: 1.4.0
     name: stable/xena
-release-notes: https://docs.openstack.org/releasenotes/python-brick-cinderclient-ext/xena.html
+  - name: unmaintained/xena
+    location: xena-eom
+release-notes:
+  https://docs.openstack.org/releasenotes/python-brick-cinderclient-ext/xena.html
diff --git a/deliverables/xena/python-cinderclient.yaml b/deliverables/xena/python-cinderclient.yaml
index 6c16675bdb..2dd97dfc17 100644
--- a/deliverables/xena/python-cinderclient.yaml
+++ b/deliverables/xena/python-cinderclient.yaml
@@ -19,7 +19,14 @@ releases:
     projects:
       - repo: openstack/python-cinderclient
         hash: fab6ddf30c4bc0add1551d5de05b9bf336317063
+  - version: xena-eom
+    projects:
+      - repo: openstack/python-cinderclient
+        hash: 64943b71b0f76b488dbf6bb11a0d7d3c905b97ec
 branches:
   - name: stable/xena
     location: 8.1.0
-release-notes: https://docs.openstack.org/releasenotes/python-cinderclient/xena.html
+  - name: unmaintained/xena
+    location: xena-eom
+release-notes:
+  https://docs.openstack.org/releasenotes/python-cinderclient/xena.html