diff --git a/deliverables/victoria/heat-agents.yaml b/deliverables/victoria/heat-agents.yaml
index f87757f851..7396961ead 100644
--- a/deliverables/victoria/heat-agents.yaml
+++ b/deliverables/victoria/heat-agents.yaml
@@ -19,7 +19,13 @@ releases:
     projects:
       - repo: openstack/heat-agents
         hash: 6725696d1ba87bc4ab112eb203a270d3c81476fc
+  - version: victoria-eom
+    projects:
+      - repo: openstack/heat-agents
+        hash: 5308254d772bde453425e5db3782d0747a43adf6
 branches:
   - name: stable/victoria
     location: 2.1.1
+  - name: unmaintained/victoria
+    location: victoria-eom
 release-notes: https://docs.openstack.org/releasenotes/heat-agents/victoria.html
diff --git a/deliverables/victoria/heat-dashboard.yaml b/deliverables/victoria/heat-dashboard.yaml
index cdccbfc89c..510792a595 100644
--- a/deliverables/victoria/heat-dashboard.yaml
+++ b/deliverables/victoria/heat-dashboard.yaml
@@ -23,7 +23,14 @@ releases:
     projects:
       - repo: openstack/heat-dashboard
         hash: 02d04ec65f0484727119779df2a72a507af1b0e2
+  - version: victoria-eom
+    projects:
+      - repo: openstack/heat-dashboard
+        hash: c0fa2a8ca1c9883106f2624203ebba9867409e2f
 branches:
   - name: stable/victoria
     location: 4.0.0.0rc1
-release-notes: https://docs.openstack.org/releasenotes/heat-dashboard/victoria.html
+  - name: unmaintained/victoria
+    location: victoria-eom
+release-notes:
+  https://docs.openstack.org/releasenotes/heat-dashboard/victoria.html
diff --git a/deliverables/victoria/heat.yaml b/deliverables/victoria/heat.yaml
index 353e0c3fc8..94f04ffb77 100644
--- a/deliverables/victoria/heat.yaml
+++ b/deliverables/victoria/heat.yaml
@@ -25,7 +25,13 @@ releases:
     projects:
       - repo: openstack/heat
         hash: cbe9be5e7625d374fc6cfbb63b7e3ef5335bf330
+  - version: victoria-eom
+    projects:
+      - repo: openstack/heat
+        hash: ec3e354afb87b197cf3deb3d60c8b3d7de74b864
 branches:
   - name: stable/victoria
     location: 15.0.0.0rc1
+  - name: unmaintained/victoria
+    location: victoria-eom
 release-notes: https://docs.openstack.org/releasenotes/heat/victoria.html
diff --git a/deliverables/victoria/python-heatclient.yaml b/deliverables/victoria/python-heatclient.yaml
index 0af5db7e53..aa59172858 100644
--- a/deliverables/victoria/python-heatclient.yaml
+++ b/deliverables/victoria/python-heatclient.yaml
@@ -19,7 +19,14 @@ releases:
     projects:
       - repo: openstack/python-heatclient
         hash: bb22add60c5d7a206ed8023d78fd155e256253a0
+  - version: victoria-eom
+    projects:
+      - repo: openstack/python-heatclient
+        hash: defd40074f5904d42357f6f7f82fcf6a25064ef6
 branches:
   - name: stable/victoria
     location: 2.2.1
-release-notes: https://docs.openstack.org/releasenotes/python-heatclient/victoria.html
+  - name: unmaintained/victoria
+    location: victoria-eom
+release-notes:
+  https://docs.openstack.org/releasenotes/python-heatclient/victoria.html
diff --git a/deliverables/wallaby/heat-agents.yaml b/deliverables/wallaby/heat-agents.yaml
index eb0de55342..093ba49fa9 100644
--- a/deliverables/wallaby/heat-agents.yaml
+++ b/deliverables/wallaby/heat-agents.yaml
@@ -15,7 +15,13 @@ releases:
     projects:
       - repo: openstack/heat-agents
         hash: fcb3c614461c654e747af23570963dacdffa38ce
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/heat-agents
+        hash: ed16cc7dd7ac774e20cf5d63b97b1ae42393c458
 branches:
   - name: stable/wallaby
     location: 2.2.0
+  - name: unmaintained/wallaby
+    location: wallaby-eom
 release-notes: https://docs.openstack.org/releasenotes/heat-agents/wallaby.html
diff --git a/deliverables/wallaby/heat-dashboard.yaml b/deliverables/wallaby/heat-dashboard.yaml
index 648b7837c1..fb05cd77d1 100644
--- a/deliverables/wallaby/heat-dashboard.yaml
+++ b/deliverables/wallaby/heat-dashboard.yaml
@@ -27,7 +27,14 @@ releases:
     projects:
       - repo: openstack/heat-dashboard
         hash: 12d092740b00e798035d39975277cd871befc908
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/heat-dashboard
+        hash: 12d092740b00e798035d39975277cd871befc908
 branches:
   - name: stable/wallaby
     location: 5.0.0.0rc1
-release-notes: https://docs.openstack.org/releasenotes/heat-dashboard/wallaby.html
+  - name: unmaintained/wallaby
+    location: wallaby-eom
+release-notes:
+  https://docs.openstack.org/releasenotes/heat-dashboard/wallaby.html
diff --git a/deliverables/wallaby/heat.yaml b/deliverables/wallaby/heat.yaml
index 6efe84465f..b617dbefbb 100644
--- a/deliverables/wallaby/heat.yaml
+++ b/deliverables/wallaby/heat.yaml
@@ -25,7 +25,13 @@ releases:
     projects:
       - repo: openstack/heat
         hash: 167ece3673f6db5db8694dff9644a73216697185
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/heat
+        hash: edc6d60327491fa2f5395a488cff4e27536db006
 branches:
   - name: stable/wallaby
     location: 16.0.0.0rc1
+  - name: unmaintained/wallaby
+    location: wallaby-eom
 release-notes: https://docs.openstack.org/releasenotes/heat/wallaby.html
diff --git a/deliverables/wallaby/python-heatclient.yaml b/deliverables/wallaby/python-heatclient.yaml
index ff9e582aa9..b75b51aaca 100644
--- a/deliverables/wallaby/python-heatclient.yaml
+++ b/deliverables/wallaby/python-heatclient.yaml
@@ -19,7 +19,14 @@ releases:
     projects:
       - repo: openstack/python-heatclient
         hash: d16c245f5defdf811de8fe8615fa06ae6daae5b5
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/python-heatclient
+        hash: d16c245f5defdf811de8fe8615fa06ae6daae5b5
 branches:
   - name: stable/wallaby
     location: 2.3.0
-release-notes: https://docs.openstack.org/releasenotes/python-heatclient/wallaby.html
+  - name: unmaintained/wallaby
+    location: wallaby-eom
+release-notes:
+  https://docs.openstack.org/releasenotes/python-heatclient/wallaby.html
diff --git a/deliverables/xena/heat-agents.yaml b/deliverables/xena/heat-agents.yaml
index d92b5bcc03..568b63270e 100644
--- a/deliverables/xena/heat-agents.yaml
+++ b/deliverables/xena/heat-agents.yaml
@@ -20,7 +20,13 @@ releases:
     projects:
       - repo: openstack/heat-agents
         hash: ba45ab41a63c22e81546c3173299bed899ffecc6
+  - version: xena-eom
+    projects:
+      - repo: openstack/heat-agents
+        hash: efce207ae7681ddc9044a2d2a19ffa1f1bcc31d2
 branches:
   - name: stable/xena
     location: 3.0.0.0rc1
+  - name: unmaintained/xena
+    location: xena-eom
 release-notes: https://docs.openstack.org/releasenotes/heat-agents/xena.html
diff --git a/deliverables/xena/heat-dashboard.yaml b/deliverables/xena/heat-dashboard.yaml
index be864eff84..2bd1a4c99b 100644
--- a/deliverables/xena/heat-dashboard.yaml
+++ b/deliverables/xena/heat-dashboard.yaml
@@ -23,7 +23,13 @@ releases:
     projects:
       - repo: openstack/heat-dashboard
         hash: 4d1ce41ba402574ce25e854d47348be507b93e3f
+  - version: xena-eom
+    projects:
+      - repo: openstack/heat-dashboard
+        hash: 4d1ce41ba402574ce25e854d47348be507b93e3f
 branches:
   - name: stable/xena
     location: 6.0.0.0rc1
+  - name: unmaintained/xena
+    location: xena-eom
 release-notes: https://docs.openstack.org/releasenotes/heat-dashboard/xena.html
diff --git a/deliverables/xena/heat.yaml b/deliverables/xena/heat.yaml
index 96d26acaf1..98331aa340 100644
--- a/deliverables/xena/heat.yaml
+++ b/deliverables/xena/heat.yaml
@@ -33,7 +33,13 @@ releases:
     projects:
       - repo: openstack/heat
         hash: b9cb496b61b0e804d41e9df1a874becc645b3089
+  - version: xena-eom
+    projects:
+      - repo: openstack/heat
+        hash: be70cee559d30e73c36199ee3609bfeff266b473
 branches:
   - name: stable/xena
     location: 17.0.0.0rc1
+  - name: unmaintained/xena
+    location: xena-eom
 release-notes: https://docs.openstack.org/releasenotes/heat/xena.html
diff --git a/deliverables/xena/python-heatclient.yaml b/deliverables/xena/python-heatclient.yaml
index fa7ed3e5a1..56c9c44282 100644
--- a/deliverables/xena/python-heatclient.yaml
+++ b/deliverables/xena/python-heatclient.yaml
@@ -15,7 +15,14 @@ releases:
     projects:
       - repo: openstack/python-heatclient
         hash: b4383147fec4cf3667d3c9c2d79e088780a1498c
+  - version: xena-eom
+    projects:
+      - repo: openstack/python-heatclient
+        hash: fa7745bb5d464cc10df119098bac97cad17043c7
 branches:
   - name: stable/xena
     location: 2.4.0
-release-notes: https://docs.openstack.org/releasenotes/python-heatclient/xena.html
+  - name: unmaintained/xena
+    location: xena-eom
+release-notes:
+  https://docs.openstack.org/releasenotes/python-heatclient/xena.html