diff --git a/deliverables/victoria/keystone.yaml b/deliverables/victoria/keystone.yaml
index 2a300e24fa..2c1b98bb63 100644
--- a/deliverables/victoria/keystone.yaml
+++ b/deliverables/victoria/keystone.yaml
@@ -23,7 +23,13 @@ releases:
     projects:
       - repo: openstack/keystone
         hash: 67584ec844ae337a146487154cb5cd57b46f201a
+  - version: victoria-eom
+    projects:
+      - repo: openstack/keystone
+        hash: 329e397917a7b6e77f8c86ce010169e07301dc6c
 branches:
   - name: stable/victoria
     location: 18.0.0.0rc1
+  - name: unmaintained/victoria
+    location: victoria-eom
 release-notes: https://docs.openstack.org/releasenotes/keystone/victoria.html
diff --git a/deliverables/victoria/keystoneauth.yaml b/deliverables/victoria/keystoneauth.yaml
index 7f16b75a27..853a52b5d2 100644
--- a/deliverables/victoria/keystoneauth.yaml
+++ b/deliverables/victoria/keystoneauth.yaml
@@ -24,7 +24,13 @@ releases:
     projects:
       - repo: openstack/keystoneauth
         hash: c2d2e7af2989a81104739f7bb0c397c9e98a3949
+  - version: victoria-eom
+    projects:
+      - repo: openstack/keystoneauth
+        hash: d93e4d290133be2cee89b0931258b8e4d1f675d5
 branches:
   - name: stable/victoria
     location: 4.2.1
+  - name: unmaintained/victoria
+    location: victoria-eom
 release-notes: https://docs.openstack.org/releasenotes/keystoneauth/victoria.html
diff --git a/deliverables/victoria/keystonemiddleware.yaml b/deliverables/victoria/keystonemiddleware.yaml
index 146c1102d2..ff648be5bb 100644
--- a/deliverables/victoria/keystonemiddleware.yaml
+++ b/deliverables/victoria/keystonemiddleware.yaml
@@ -15,7 +15,14 @@ releases:
     projects:
       - repo: openstack/keystonemiddleware
         hash: 654d31a1bd32968bfa008a117a60b58e18d68df8
+  - version: victoria-eom
+    projects:
+      - repo: openstack/keystonemiddleware
+        hash: 3b403b91b3337d75799c30d7f9defb6ccecf3b6c
 branches:
   - name: stable/victoria
     location: 9.1.0
-release-notes: https://docs.openstack.org/releasenotes/keystonemiddleware/victoria.html
+  - name: unmaintained/victoria
+    location: victoria-eom
+release-notes:
+  https://docs.openstack.org/releasenotes/keystonemiddleware/victoria.html
diff --git a/deliverables/victoria/pycadf.yaml b/deliverables/victoria/pycadf.yaml
index a957a819b5..db497ad108 100644
--- a/deliverables/victoria/pycadf.yaml
+++ b/deliverables/victoria/pycadf.yaml
@@ -19,6 +19,10 @@ releases:
     projects:
       - repo: openstack/pycadf
         hash: 4179996d52dbd37f3fd966225b4157343a75239c
+  - version: victoria-eol
+    projects:
+      - repo: openstack/pycadf
+        hash: 0475709c0734d8314637298de2fd2b005ad5a1cb
 branches:
   - name: stable/victoria
     location: 3.1.1
diff --git a/deliverables/victoria/python-keystoneclient.yaml b/deliverables/victoria/python-keystoneclient.yaml
index a52f65ecc7..d72aa569c7 100644
--- a/deliverables/victoria/python-keystoneclient.yaml
+++ b/deliverables/victoria/python-keystoneclient.yaml
@@ -19,7 +19,14 @@ releases:
     projects:
       - repo: openstack/python-keystoneclient
         hash: 81229eb2c1606e99518fefc6b7bc2c4dd1221978
+  - version: victoria-eom
+    projects:
+      - repo: openstack/python-keystoneclient
+        hash: 3e3422080f0c992b9430bf8779b188cbea1ec322
 branches:
   - name: stable/victoria
     location: 4.1.1
-release-notes: https://docs.openstack.org/releasenotes/python-keystoneclient/victoria.html
+  - name: unmaintained/victoria
+    location: victoria-eom
+release-notes:
+  https://docs.openstack.org/releasenotes/python-keystoneclient/victoria.html
diff --git a/deliverables/wallaby/keystone.yaml b/deliverables/wallaby/keystone.yaml
index f1f029eb6b..546f699d9b 100644
--- a/deliverables/wallaby/keystone.yaml
+++ b/deliverables/wallaby/keystone.yaml
@@ -27,7 +27,13 @@ releases:
     projects:
       - repo: openstack/keystone
         hash: 6c75b657352a86e50e63aec44d28784d8863df99
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/keystone
+        hash: 8c5d283af91478e1203491d656ae6b236e2d84fb
 branches:
   - name: stable/wallaby
     location: 19.0.0.0rc1
+  - name: unmaintained/wallaby
+    location: wallaby-eom
 release-notes: https://docs.openstack.org/releasenotes/keystone/wallaby.html
diff --git a/deliverables/wallaby/keystoneauth.yaml b/deliverables/wallaby/keystoneauth.yaml
index 8608d3d70f..29b23206eb 100644
--- a/deliverables/wallaby/keystoneauth.yaml
+++ b/deliverables/wallaby/keystoneauth.yaml
@@ -20,7 +20,13 @@ releases:
     projects:
       - repo: openstack/keystoneauth
         hash: 112bcae1fbec355fcb58da07ae1d9f1adf8b77ba
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/keystoneauth
+        hash: 2504ca98bfe8459f0fdc3e7c9510c8c663055b90
 branches:
   - name: stable/wallaby
     location: 4.3.1
+  - name: unmaintained/wallaby
+    location: wallaby-eom
 release-notes: https://docs.openstack.org/releasenotes/keystoneauth/wallaby.html
diff --git a/deliverables/wallaby/keystonemiddleware.yaml b/deliverables/wallaby/keystonemiddleware.yaml
index a176676302..207feabf55 100644
--- a/deliverables/wallaby/keystonemiddleware.yaml
+++ b/deliverables/wallaby/keystonemiddleware.yaml
@@ -15,7 +15,14 @@ releases:
     projects:
       - repo: openstack/keystonemiddleware
         hash: 3659bdad861c1648dc53a1f66c968e82b498eb9c
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/keystonemiddleware
+        hash: 2ea733ee0f1fa103d34344cdf618ea322ab229e8
 branches:
   - name: stable/wallaby
     location: 9.2.0
-release-notes: https://docs.openstack.org/releasenotes/keystonemiddleware/wallaby.html
+  - name: unmaintained/wallaby
+    location: wallaby-eom
+release-notes:
+  https://docs.openstack.org/releasenotes/keystonemiddleware/wallaby.html
diff --git a/deliverables/wallaby/python-keystoneclient.yaml b/deliverables/wallaby/python-keystoneclient.yaml
index cfd09068b8..79049eb54d 100644
--- a/deliverables/wallaby/python-keystoneclient.yaml
+++ b/deliverables/wallaby/python-keystoneclient.yaml
@@ -15,7 +15,14 @@ releases:
     projects:
       - repo: openstack/python-keystoneclient
         hash: d5cb761763988217cdd00a7981a62e2083fd381f
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/python-keystoneclient
+        hash: 3fe898ba4d170c2131cf857045d70e24ab376471
 branches:
   - name: stable/wallaby
     location: 4.2.0
-release-notes: https://docs.openstack.org/releasenotes/python-keystoneclient/wallaby.html
+  - name: unmaintained/wallaby
+    location: wallaby-eom
+release-notes:
+  https://docs.openstack.org/releasenotes/python-keystoneclient/wallaby.html
diff --git a/deliverables/xena/keystone.yaml b/deliverables/xena/keystone.yaml
index dc32880c99..2b123fe152 100644
--- a/deliverables/xena/keystone.yaml
+++ b/deliverables/xena/keystone.yaml
@@ -23,7 +23,13 @@ releases:
     projects:
       - repo: openstack/keystone
         hash: 3a8a6c89c69819510571181adde62b68ed812752
+  - version: xena-eom
+    projects:
+      - repo: openstack/keystone
+        hash: 5f5e43b2902512288ee8aac1a0968a56bd3cbf8c
 branches:
   - name: stable/xena
     location: 20.0.0.0rc1
+  - name: unmaintained/xena
+    location: xena-eom
 release-notes: https://docs.openstack.org/releasenotes/keystone/xena.html
diff --git a/deliverables/xena/keystoneauth.yaml b/deliverables/xena/keystoneauth.yaml
index 8ce7436afc..47263acd17 100644
--- a/deliverables/xena/keystoneauth.yaml
+++ b/deliverables/xena/keystoneauth.yaml
@@ -16,7 +16,13 @@ releases:
     projects:
       - repo: openstack/keystoneauth
         hash: 112bcae1fbec355fcb58da07ae1d9f1adf8b77ba
+  - version: xena-eom
+    projects:
+      - repo: openstack/keystoneauth
+        hash: 6d3c4817f2741d1cc527470091bb6a39e8480da0
 branches:
   - name: stable/xena
     location: 4.4.0
+  - name: unmaintained/xena
+    location: xena-eom
 release-notes: https://docs.openstack.org/releasenotes/keystoneauth/xena.html
diff --git a/deliverables/xena/keystonemiddleware.yaml b/deliverables/xena/keystonemiddleware.yaml
index 5d38ad84bb..02425cd88e 100644
--- a/deliverables/xena/keystonemiddleware.yaml
+++ b/deliverables/xena/keystonemiddleware.yaml
@@ -15,7 +15,14 @@ releases:
     projects:
       - repo: openstack/keystonemiddleware
         hash: 90df936708aee36d77cead548d04cb7db2327f47
+  - version: xena-eom
+    projects:
+      - repo: openstack/keystonemiddleware
+        hash: 8de54a8193985a33d6e7524010e85fde727fe0d2
 branches:
   - name: stable/xena
     location: 9.3.0
-release-notes: https://docs.openstack.org/releasenotes/keystonemiddleware/xena.html
+  - name: unmaintained/xena
+    location: xena-eom
+release-notes:
+  https://docs.openstack.org/releasenotes/keystonemiddleware/xena.html
diff --git a/deliverables/xena/python-keystoneclient.yaml b/deliverables/xena/python-keystoneclient.yaml
index 1a9a1ef019..4c175bceb4 100644
--- a/deliverables/xena/python-keystoneclient.yaml
+++ b/deliverables/xena/python-keystoneclient.yaml
@@ -15,7 +15,14 @@ releases:
     projects:
       - repo: openstack/python-keystoneclient
         hash: d5cb761763988217cdd00a7981a62e2083fd381f
+  - version: xena-eom
+    projects:
+      - repo: openstack/python-keystoneclient
+        hash: 0678eac95aa98b50a5fd0fb9fa55031508c99d26
 branches:
   - name: stable/xena
     location: 4.3.0
-release-notes: https://docs.openstack.org/releasenotes/python-keystoneclient/xena.html
+  - name: unmaintained/xena
+    location: xena-eom
+release-notes:
+  https://docs.openstack.org/releasenotes/python-keystoneclient/xena.html