diff --git a/deliverables/victoria/heat-translator.yaml b/deliverables/victoria/heat-translator.yaml
index 4689c5b12b..bd35a09b1a 100644
--- a/deliverables/victoria/heat-translator.yaml
+++ b/deliverables/victoria/heat-translator.yaml
@@ -15,6 +15,12 @@ releases:
     projects:
       - repo: openstack/heat-translator
         hash: 92efac641321d548090eecaf0cff1c75bcd01068
+  - version: victoria-eom
+    projects:
+      - repo: openstack/heat-translator
+        hash: c9ae1e17c25aeae8d421b3669dae781bebda7b56
 branches:
   - name: stable/victoria
     location: 2.1.0
+  - name: unmaintained/victoria
+    location: victoria-eom
diff --git a/deliverables/victoria/python-tackerclient.yaml b/deliverables/victoria/python-tackerclient.yaml
index 7237a54891..36ec3992be 100644
--- a/deliverables/victoria/python-tackerclient.yaml
+++ b/deliverables/victoria/python-tackerclient.yaml
@@ -19,7 +19,14 @@ releases:
     projects:
       - repo: openstack/python-tackerclient
         hash: 8ff2f35476027975d44fa7f6dad4a8ee022ff898
+  - version: victoria-eom
+    projects:
+      - repo: openstack/python-tackerclient
+        hash: 774923c5bbd9c089cc92a6c0e55459bd83e8275a
 branches:
   - name: stable/victoria
     location: 1.3.0
-release-notes: https://docs.openstack.org/releasenotes/python-tackerclient/victoria.html
+  - name: unmaintained/victoria
+    location: victoria-eom
+release-notes:
+  https://docs.openstack.org/releasenotes/python-tackerclient/victoria.html
diff --git a/deliverables/victoria/tacker-horizon.yaml b/deliverables/victoria/tacker-horizon.yaml
index dbd6d060fc..c92de19cbd 100644
--- a/deliverables/victoria/tacker-horizon.yaml
+++ b/deliverables/victoria/tacker-horizon.yaml
@@ -19,6 +19,12 @@ releases:
     projects:
       - repo: openstack/tacker-horizon
         hash: fe74538ae2e415381ad8a6489d30125442088526
+  - version: victoria-eom
+    projects:
+      - repo: openstack/tacker-horizon
+        hash: d469727485f3cd0024659eadd9f5e807b629d745
 branches:
   - name: stable/victoria
     location: 2.0.0.0rc1
+  - name: unmaintained/victoria
+    location: victoria-eom
diff --git a/deliverables/victoria/tacker.yaml b/deliverables/victoria/tacker.yaml
index 26cccb618f..5f8e2fe887 100644
--- a/deliverables/victoria/tacker.yaml
+++ b/deliverables/victoria/tacker.yaml
@@ -36,7 +36,13 @@ releases:
     projects:
       - repo: openstack/tacker
         hash: 66fd77ab3be8e49f11001603f5ff92d3bf18a24a
+  - version: victoria-eom
+    projects:
+      - repo: openstack/tacker
+        hash: 66fd77ab3be8e49f11001603f5ff92d3bf18a24a
 branches:
   - name: stable/victoria
     location: 4.0.0.0rc1
+  - name: unmaintained/victoria
+    location: victoria-eom
 release-notes: https://docs.openstack.org/releasenotes/tacker/victoria.html
diff --git a/deliverables/victoria/tosca-parser.yaml b/deliverables/victoria/tosca-parser.yaml
index ae405d6bf3..696f2667d6 100644
--- a/deliverables/victoria/tosca-parser.yaml
+++ b/deliverables/victoria/tosca-parser.yaml
@@ -19,6 +19,12 @@ releases:
     projects:
       - repo: openstack/tosca-parser
         hash: 9b42fa3d32725fc1f2538878bb9b0fa8c84b9d9b
+  - version: victoria-eom
+    projects:
+      - repo: openstack/tosca-parser
+        hash: ab76222e441c8b230753edc288e92f0429272a29
 branches:
   - name: stable/victoria
     location: 2.1.1
+  - name: unmaintained/victoria
+    location: victoria-eom
diff --git a/deliverables/wallaby/heat-translator.yaml b/deliverables/wallaby/heat-translator.yaml
index 929623a6c0..924732aba9 100644
--- a/deliverables/wallaby/heat-translator.yaml
+++ b/deliverables/wallaby/heat-translator.yaml
@@ -19,6 +19,12 @@ releases:
     projects:
       - repo: openstack/heat-translator
         hash: a241c9c48f8105d071d7da7c620fc3afe6fd0f7c
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/heat-translator
+        hash: d4208a6a56e414ab4e774700218426f5ae8ad295
 branches:
   - name: stable/wallaby
     location: 2.2.0
+  - name: unmaintained/wallaby
+    location: wallaby-eom
diff --git a/deliverables/wallaby/python-tackerclient.yaml b/deliverables/wallaby/python-tackerclient.yaml
index 6d7d04d4fe..0150870fc5 100644
--- a/deliverables/wallaby/python-tackerclient.yaml
+++ b/deliverables/wallaby/python-tackerclient.yaml
@@ -23,7 +23,14 @@ releases:
     projects:
       - repo: openstack/python-tackerclient
         hash: 4e6dc4c0310f02e3b71941df676674b138081890
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/python-tackerclient
+        hash: 8636b3dbb5f4cf078f25dba21969d57426c7f42b
 branches:
   - name: stable/wallaby
     location: 1.6.0
-release-notes: https://docs.openstack.org/releasenotes/python-tackerclient/wallaby.html
+  - name: unmaintained/wallaby
+    location: wallaby-eom
+release-notes:
+  https://docs.openstack.org/releasenotes/python-tackerclient/wallaby.html
diff --git a/deliverables/wallaby/tacker-horizon.yaml b/deliverables/wallaby/tacker-horizon.yaml
index 8098480c42..58af2502b0 100644
--- a/deliverables/wallaby/tacker-horizon.yaml
+++ b/deliverables/wallaby/tacker-horizon.yaml
@@ -19,6 +19,12 @@ releases:
     projects:
       - repo: openstack/tacker-horizon
         hash: 70566f48610c5917f9b24b9804f843a76a4effef
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/tacker-horizon
+        hash: e9271d5919b4bd76e4884f781aa0d6a612240d1e
 branches:
   - name: stable/wallaby
     location: 3.0.0.0rc1
+  - name: unmaintained/wallaby
+    location: wallaby-eom
diff --git a/deliverables/wallaby/tacker.yaml b/deliverables/wallaby/tacker.yaml
index 861253bd52..ca51eb2621 100644
--- a/deliverables/wallaby/tacker.yaml
+++ b/deliverables/wallaby/tacker.yaml
@@ -43,7 +43,13 @@ releases:
     projects:
       - repo: openstack/tacker
         hash: 098370444733c035a4092ef89eea13594fecd2a3
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/tacker
+        hash: 74fd9813aed21589da79ce9e0fcea19345fca089
 branches:
   - name: stable/wallaby
     location: 5.0.0.0rc1
+  - name: unmaintained/wallaby
+    location: wallaby-eom
 release-notes: https://docs.openstack.org/releasenotes/tacker/wallaby.html
diff --git a/deliverables/wallaby/tosca-parser.yaml b/deliverables/wallaby/tosca-parser.yaml
index 4608953cc1..37f9054e13 100644
--- a/deliverables/wallaby/tosca-parser.yaml
+++ b/deliverables/wallaby/tosca-parser.yaml
@@ -19,6 +19,12 @@ releases:
     projects:
       - repo: openstack/tosca-parser
         hash: a1c2cbe960766629c74f3d26a46219b52f5f1bb3
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/tosca-parser
+        hash: 12d325ecf041da085b03774624f90d01303c2e95
 branches:
   - name: stable/wallaby
     location: 2.3.0
+  - name: unmaintained/wallaby
+    location: wallaby-eom
diff --git a/deliverables/xena/heat-translator.yaml b/deliverables/xena/heat-translator.yaml
index 60e6eded07..8ecb228105 100644
--- a/deliverables/xena/heat-translator.yaml
+++ b/deliverables/xena/heat-translator.yaml
@@ -19,6 +19,12 @@ releases:
     projects:
       - repo: openstack/heat-translator
         hash: 0b8fba577f4ba2ff5131f71fc72ef846400ccc88
+  - version: xena-eom
+    projects:
+      - repo: openstack/heat-translator
+        hash: b3bb0e9b8582dfc09a8520d75722b990901dd91a
 branches:
   - name: stable/xena
     location: 2.4.1
+  - name: unmaintained/xena
+    location: xena-eom
diff --git a/deliverables/xena/python-tackerclient.yaml b/deliverables/xena/python-tackerclient.yaml
index 142010ad33..f0235dc223 100644
--- a/deliverables/xena/python-tackerclient.yaml
+++ b/deliverables/xena/python-tackerclient.yaml
@@ -19,7 +19,14 @@ releases:
     projects:
       - repo: openstack/python-tackerclient
         hash: 98789f8f9af345894cee523df254704babf80156
+  - version: xena-eom
+    projects:
+      - repo: openstack/python-tackerclient
+        hash: 98c1f145070022b5480cdd74e5e06c4ada860238
 branches:
   - name: stable/xena
     location: 1.8.0
-release-notes: https://docs.openstack.org/releasenotes/python-tackerclient/xena.html
+  - name: unmaintained/xena
+    location: xena-eom
+release-notes:
+  https://docs.openstack.org/releasenotes/python-tackerclient/xena.html
diff --git a/deliverables/xena/tacker-horizon.yaml b/deliverables/xena/tacker-horizon.yaml
index de5be674f2..7d0de32537 100644
--- a/deliverables/xena/tacker-horizon.yaml
+++ b/deliverables/xena/tacker-horizon.yaml
@@ -19,6 +19,12 @@ releases:
     projects:
       - repo: openstack/tacker-horizon
         hash: 69a6eb481f7322cc69ae40f39630b81db6571a74
+  - version: xena-eom
+    projects:
+      - repo: openstack/tacker-horizon
+        hash: e4db36133b9e396b0bc4a61c9bcdcad2c04c6520
 branches:
   - name: stable/xena
     location: 4.0.0.0rc1
+  - name: unmaintained/xena
+    location: xena-eom
diff --git a/deliverables/xena/tacker.yaml b/deliverables/xena/tacker.yaml
index 287b20675b..64d006c85e 100644
--- a/deliverables/xena/tacker.yaml
+++ b/deliverables/xena/tacker.yaml
@@ -23,7 +23,13 @@ releases:
     projects:
       - repo: openstack/tacker
         hash: 43b19f63078a93b2b7ce717e313993cb51e34a3b
+  - version: xena-eom
+    projects:
+      - repo: openstack/tacker
+        hash: 43b19f63078a93b2b7ce717e313993cb51e34a3b
 branches:
   - name: stable/xena
     location: 6.0.0.0rc1
+  - name: unmaintained/xena
+    location: xena-eom
 release-notes: https://docs.openstack.org/releasenotes/tacker/xena.html
diff --git a/deliverables/xena/tosca-parser.yaml b/deliverables/xena/tosca-parser.yaml
index 7fe5c04e03..cc495f207c 100644
--- a/deliverables/xena/tosca-parser.yaml
+++ b/deliverables/xena/tosca-parser.yaml
@@ -19,6 +19,12 @@ releases:
     projects:
       - repo: openstack/tosca-parser
         hash: 0014362ab14db122b02630bbf99c3205e5fa58aa
+  - version: xena-eom
+    projects:
+      - repo: openstack/tosca-parser
+        hash: 9dae032ff67ab3fe80759b379ded7ba0a9f75f8f
 branches:
   - name: stable/xena
     location: 2.4.1
+  - name: unmaintained/xena
+    location: xena-eom