diff --git a/deliverables/victoria/manila-ui.yaml b/deliverables/victoria/manila-ui.yaml
index 3c4b171da1..22de5b604a 100644
--- a/deliverables/victoria/manila-ui.yaml
+++ b/deliverables/victoria/manila-ui.yaml
@@ -24,7 +24,13 @@ releases:
     projects:
       - repo: openstack/manila-ui
         hash: bf820e10c742c3aff610665d7ec1b7c56a1fea9f
+  - version: victoria-eom
+    projects:
+      - repo: openstack/manila-ui
+        hash: bf820e10c742c3aff610665d7ec1b7c56a1fea9f
 branches:
   - name: stable/victoria
     location: 4.0.0.0rc1
+  - name: unmaintained/victoria
+    location: victoria-eom
 release-notes: https://docs.openstack.org/releasenotes/manila-ui/victoria.html
diff --git a/deliverables/victoria/manila.yaml b/deliverables/victoria/manila.yaml
index 9c0e3efa98..8bd98b07bf 100644
--- a/deliverables/victoria/manila.yaml
+++ b/deliverables/victoria/manila.yaml
@@ -47,7 +47,13 @@ releases:
     projects:
       - repo: openstack/manila
         hash: 0f337b5d338a378aebb8e2f168c4042f5fb6bbd1
+  - version: victoria-eom
+    projects:
+      - repo: openstack/manila
+        hash: 2a1ffee182b6af7c788034eec51224c9b5d1c4d8
 branches:
   - name: stable/victoria
     location: 11.0.0.0rc1
+  - name: unmaintained/victoria
+    location: victoria-eom
 release-notes: https://docs.openstack.org/releasenotes/manila/victoria.html
diff --git a/deliverables/victoria/python-manilaclient.yaml b/deliverables/victoria/python-manilaclient.yaml
index 59f4275738..a02f0386b3 100644
--- a/deliverables/victoria/python-manilaclient.yaml
+++ b/deliverables/victoria/python-manilaclient.yaml
@@ -27,7 +27,14 @@ releases:
     projects:
       - repo: openstack/python-manilaclient
         hash: eee6ca937c1358b00e95978e9ea81be82d93d422
+  - version: victoria-eom
+    projects:
+      - repo: openstack/python-manilaclient
+        hash: 384815e55939bf6248b63686edb68d14a95dfdfa
 branches:
   - name: stable/victoria
     location: 2.3.0
-release-notes: https://docs.openstack.org/releasenotes/python-manilaclient/victoria.html
+  - name: unmaintained/victoria
+    location: victoria-eom
+release-notes:
+  https://docs.openstack.org/releasenotes/python-manilaclient/victoria.html
diff --git a/deliverables/wallaby/manila-ui.yaml b/deliverables/wallaby/manila-ui.yaml
index 758fbb4dd0..e01b50f96c 100644
--- a/deliverables/wallaby/manila-ui.yaml
+++ b/deliverables/wallaby/manila-ui.yaml
@@ -28,7 +28,13 @@ releases:
     projects:
       - repo: openstack/manila-ui
         hash: f421aeb1e18664411cbb20420fe2c4847767573b
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/manila-ui
+        hash: db23e837398c7196b6d1eb9b4f2f8fd5f3865b3d
 branches:
   - name: stable/wallaby
     location: 5.0.0.0rc1
+  - name: unmaintained/wallaby
+    location: wallaby-eom
 release-notes: https://docs.openstack.org/releasenotes/manila-ui/wallaby.html
diff --git a/deliverables/wallaby/manila.yaml b/deliverables/wallaby/manila.yaml
index a71b12115c..46692c6102 100644
--- a/deliverables/wallaby/manila.yaml
+++ b/deliverables/wallaby/manila.yaml
@@ -56,7 +56,13 @@ releases:
     projects:
       - repo: openstack/manila
         hash: f5b2cdc23d61b41a739d4a74b477fec63972f1af
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/manila
+        hash: 96cca4b94ebac0b81cf2f7dcd27202d4a60ea7bf
 branches:
   - name: stable/wallaby
     location: 12.0.0.0rc1
+  - name: unmaintained/wallaby
+    location: wallaby-eom
 release-notes: https://docs.openstack.org/releasenotes/manila/wallaby.html
diff --git a/deliverables/wallaby/python-manilaclient.yaml b/deliverables/wallaby/python-manilaclient.yaml
index e100a26e49..bab6bf3fd2 100644
--- a/deliverables/wallaby/python-manilaclient.yaml
+++ b/deliverables/wallaby/python-manilaclient.yaml
@@ -39,7 +39,14 @@ releases:
     projects:
       - repo: openstack/python-manilaclient
         hash: 7f7d7d32dcabfa619ea9e1717483062026e0b61f
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/python-manilaclient
+        hash: 2247f1853f1c6a15b21103c9c2ac690919bfc123
 branches:
   - name: stable/wallaby
     location: 2.6.0
-release-notes: https://docs.openstack.org/releasenotes/python-manilaclient/wallaby.html
+  - name: unmaintained/wallaby
+    location: wallaby-eom
+release-notes:
+  https://docs.openstack.org/releasenotes/python-manilaclient/wallaby.html
diff --git a/deliverables/xena/manila-ui.yaml b/deliverables/xena/manila-ui.yaml
index a48093dffd..f8a72f5883 100644
--- a/deliverables/xena/manila-ui.yaml
+++ b/deliverables/xena/manila-ui.yaml
@@ -20,7 +20,13 @@ releases:
     projects:
       - repo: openstack/manila-ui
         hash: 299e102ba50755d79259d6d7ccab9ee8a7043fc7
+  - version: xena-eom
+    projects:
+      - repo: openstack/manila-ui
+        hash: df769444226347e41c6cb7304c72aa892dfe0e0e
 branches:
   - name: stable/xena
     location: 6.0.0.0rc1
+  - name: unmaintained/xena
+    location: xena-eom
 release-notes: https://docs.openstack.org/releasenotes/manila-ui/xena.html
diff --git a/deliverables/xena/manila.yaml b/deliverables/xena/manila.yaml
index e768ce2f34..8eb6d9a992 100644
--- a/deliverables/xena/manila.yaml
+++ b/deliverables/xena/manila.yaml
@@ -64,7 +64,13 @@ releases:
       - repo: openstack/manila
         hash: af9d0658aad17d4ad9e5053e5c5b07df7924bd58
 
+  - version: xena-eom
+    projects:
+      - repo: openstack/manila
+        hash: 8ab5ec6b4f9393d940da6222188be2341816aace
 branches:
   - name: stable/xena
     location: 13.0.0.0rc1
+  - name: unmaintained/xena
+    location: xena-eom
 release-notes: https://docs.openstack.org/releasenotes/manila/xena.html
diff --git a/deliverables/xena/python-manilaclient.yaml b/deliverables/xena/python-manilaclient.yaml
index c5a1292109..395a593fba 100644
--- a/deliverables/xena/python-manilaclient.yaml
+++ b/deliverables/xena/python-manilaclient.yaml
@@ -31,7 +31,14 @@ releases:
     projects:
       - repo: openstack/python-manilaclient
         hash: 135cdf98c3178276346d8b7764f8877111491919
+  - version: xena-eom
+    projects:
+      - repo: openstack/python-manilaclient
+        hash: 80093c0f7298b062c6916fafb32ff8b337d6a5f7
 branches:
   - name: stable/xena
     location: 3.0.0
-release-notes: https://docs.openstack.org/releasenotes/python-manilaclient/xena.html
+  - name: unmaintained/xena
+    location: xena-eom
+release-notes:
+  https://docs.openstack.org/releasenotes/python-manilaclient/xena.html