diff --git a/deliverables/wallaby/puppet-aodh.yaml b/deliverables/wallaby/puppet-aodh.yaml
index f882bec72c..3058aa34fc 100644
--- a/deliverables/wallaby/puppet-aodh.yaml
+++ b/deliverables/wallaby/puppet-aodh.yaml
@@ -34,7 +34,13 @@ releases:
     projects:
       - repo: openstack/puppet-aodh
         hash: 5817b59f38c1cde9da220ab8790fb9fd1c3829f6
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/puppet-aodh
+        hash: 3e47b5ac9dc4f205a73c8ccbfbebdc47902d53d5
 branches:
   - name: stable/wallaby
     location: 18.4.0
+  - name: unmaintained/wallaby
+    location: wallaby-eom
 release-notes: https://docs.openstack.org/releasenotes/puppet-aodh/wallaby.html
diff --git a/deliverables/wallaby/puppet-barbican.yaml b/deliverables/wallaby/puppet-barbican.yaml
index 2deffb22a5..6526a47b3a 100644
--- a/deliverables/wallaby/puppet-barbican.yaml
+++ b/deliverables/wallaby/puppet-barbican.yaml
@@ -34,7 +34,14 @@ releases:
     projects:
       - repo: openstack/puppet-barbican
         hash: 5edeebfa4466ef129017aa05e91d01a5925ffa2c
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/puppet-barbican
+        hash: af6c77b120a5cd658f980ce1a8f36cf117422ec9
 branches:
   - name: stable/wallaby
     location: 18.4.0
-release-notes: https://docs.openstack.org/releasenotes/puppet-barbican/wallaby.html
+  - name: unmaintained/wallaby
+    location: wallaby-eom
+release-notes:
+  https://docs.openstack.org/releasenotes/puppet-barbican/wallaby.html
diff --git a/deliverables/wallaby/puppet-ceilometer.yaml b/deliverables/wallaby/puppet-ceilometer.yaml
index 45138f7475..2ffb6c70bc 100644
--- a/deliverables/wallaby/puppet-ceilometer.yaml
+++ b/deliverables/wallaby/puppet-ceilometer.yaml
@@ -38,7 +38,14 @@ releases:
     projects:
       - repo: openstack/puppet-ceilometer
         hash: 4c2ea391a53ee85cf4ef1b0d38488763f64a0c01
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/puppet-ceilometer
+        hash: 3838907d3a37c2da375f4e64952241e0fc82543f
 branches:
   - name: stable/wallaby
     location: 18.4.0
-release-notes: https://docs.openstack.org/releasenotes/puppet-ceilometer/wallaby.html
+  - name: unmaintained/wallaby
+    location: wallaby-eom
+release-notes:
+  https://docs.openstack.org/releasenotes/puppet-ceilometer/wallaby.html
diff --git a/deliverables/wallaby/puppet-cinder.yaml b/deliverables/wallaby/puppet-cinder.yaml
index a272c338e0..1259212406 100644
--- a/deliverables/wallaby/puppet-cinder.yaml
+++ b/deliverables/wallaby/puppet-cinder.yaml
@@ -38,7 +38,13 @@ releases:
     projects:
       - repo: openstack/puppet-cinder
         hash: 592f74a93d00390cb7c16642d0ce88525f50651c
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/puppet-cinder
+        hash: c693cd9cdd766faff5a0ead41478717d17ba4a26
 branches:
   - name: stable/wallaby
     location: 18.4.0
+  - name: unmaintained/wallaby
+    location: wallaby-eom
 release-notes: https://docs.openstack.org/releasenotes/puppet-cinder/wallaby.html
diff --git a/deliverables/wallaby/puppet-cloudkitty.yaml b/deliverables/wallaby/puppet-cloudkitty.yaml
index 5dbe354f42..04d29bbb4f 100644
--- a/deliverables/wallaby/puppet-cloudkitty.yaml
+++ b/deliverables/wallaby/puppet-cloudkitty.yaml
@@ -30,7 +30,14 @@ releases:
     projects:
       - repo: openstack/puppet-cloudkitty
         hash: 6d2553ca372ecac263f4559fdbcdb2c68260d734
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/puppet-cloudkitty
+        hash: 4626bdf5e26087a424b007c30efb7f3feb11bb09
 branches:
   - name: stable/wallaby
     location: 7.4.0
-release-notes: https://docs.openstack.org/releasenotes/puppet-cloudkitty/wallaby.html
+  - name: unmaintained/wallaby
+    location: wallaby-eom
+release-notes:
+  https://docs.openstack.org/releasenotes/puppet-cloudkitty/wallaby.html
diff --git a/deliverables/wallaby/puppet-designate.yaml b/deliverables/wallaby/puppet-designate.yaml
index b77fd6e752..f0ca222e76 100644
--- a/deliverables/wallaby/puppet-designate.yaml
+++ b/deliverables/wallaby/puppet-designate.yaml
@@ -38,7 +38,14 @@ releases:
     projects:
       - repo: openstack/puppet-designate
         hash: a9b41c3ad5df715ef1e93fb77ca5f12f5183f252
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/puppet-designate
+        hash: f4c0b892eb3d95df1091ac25e06b48d9bd2243b2
 branches:
   - name: stable/wallaby
     location: 18.4.0
-release-notes: https://docs.openstack.org/releasenotes/puppet-designate/wallaby.html
+  - name: unmaintained/wallaby
+    location: wallaby-eom
+release-notes:
+  https://docs.openstack.org/releasenotes/puppet-designate/wallaby.html
diff --git a/deliverables/wallaby/puppet-ec2api.yaml b/deliverables/wallaby/puppet-ec2api.yaml
index 935683fa51..ae92eb63bd 100644
--- a/deliverables/wallaby/puppet-ec2api.yaml
+++ b/deliverables/wallaby/puppet-ec2api.yaml
@@ -32,7 +32,13 @@ releases:
     projects:
       - repo: openstack/puppet-ec2api
         hash: 842938e20814fd2f3389b0b52f82dceef3477e1e
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/puppet-ec2api
+        hash: 9bfd4f5b78279c19c2b392a7553fe14345689289
 branches:
   - name: stable/wallaby
     location: 18.4.0
+  - name: unmaintained/wallaby
+    location: wallaby-eom
 release-notes: https://docs.openstack.org/releasenotes/puppet-ec2api/wallaby.html
diff --git a/deliverables/wallaby/puppet-freezer.yaml b/deliverables/wallaby/puppet-freezer.yaml
index 31d4d6d482..6d643fd4af 100644
--- a/deliverables/wallaby/puppet-freezer.yaml
+++ b/deliverables/wallaby/puppet-freezer.yaml
@@ -36,7 +36,12 @@ releases:
     projects:
       - repo: openstack/puppet-freezer
         hash: 3cfea75c6874fcff066fdd566adb5a6a4da5d26c
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/puppet-freezer
+        hash: dcfdb9433f0f053d2c4f05cd5f4b16bed7ba752b
 branches:
   - name: stable/wallaby
     location: 18.4.0
-release-notes: https://docs.openstack.org/releasenotes/puppet-freezer/wallaby.html
+release-notes:
+  https://docs.openstack.org/releasenotes/puppet-freezer/wallaby.html
diff --git a/deliverables/wallaby/puppet-glance.yaml b/deliverables/wallaby/puppet-glance.yaml
index 03a3820a68..0cd352f09e 100644
--- a/deliverables/wallaby/puppet-glance.yaml
+++ b/deliverables/wallaby/puppet-glance.yaml
@@ -38,7 +38,13 @@ releases:
     projects:
       - repo: openstack/puppet-glance
         hash: f1ee98b833984073016afb932a29246f5b0ea303
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/puppet-glance
+        hash: 255ec9b3718f0def74974ad9659ddc58b8215694
 branches:
   - name: stable/wallaby
     location: 18.4.0
+  - name: unmaintained/wallaby
+    location: wallaby-eom
 release-notes: https://docs.openstack.org/releasenotes/puppet-glance/wallaby.html
diff --git a/deliverables/wallaby/puppet-glare.yaml b/deliverables/wallaby/puppet-glare.yaml
index c64fe623cd..dfe034f7e8 100644
--- a/deliverables/wallaby/puppet-glare.yaml
+++ b/deliverables/wallaby/puppet-glare.yaml
@@ -32,6 +32,10 @@ releases:
     projects:
       - repo: openstack/puppet-glare
         hash: 774171c6a2c4ca9c3a9744d2da6864a722143eeb
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/puppet-glare
+        hash: 08e99b825007fe5152a6ba99d9a4bf8dee4bac53
 branches:
   - name: stable/wallaby
     location: 7.4.0
diff --git a/deliverables/wallaby/puppet-gnocchi.yaml b/deliverables/wallaby/puppet-gnocchi.yaml
index afe4723115..f1139ac875 100644
--- a/deliverables/wallaby/puppet-gnocchi.yaml
+++ b/deliverables/wallaby/puppet-gnocchi.yaml
@@ -38,7 +38,14 @@ releases:
     projects:
       - repo: openstack/puppet-gnocchi
         hash: 457dee3856445b624e2de8be34e3602c6b270016
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/puppet-gnocchi
+        hash: 7584b9495ac09e94f4c3406227ab8f2931e1e318
 branches:
   - name: stable/wallaby
     location: 18.4.0
-release-notes: https://docs.openstack.org/releasenotes/puppet-gnocchi/wallaby.html
+  - name: unmaintained/wallaby
+    location: wallaby-eom
+release-notes:
+  https://docs.openstack.org/releasenotes/puppet-gnocchi/wallaby.html
diff --git a/deliverables/wallaby/puppet-heat.yaml b/deliverables/wallaby/puppet-heat.yaml
index 4bb7030304..325293e327 100644
--- a/deliverables/wallaby/puppet-heat.yaml
+++ b/deliverables/wallaby/puppet-heat.yaml
@@ -30,7 +30,13 @@ releases:
     projects:
       - repo: openstack/puppet-heat
         hash: 4a997f2ef3873da56a75a9e970e24df10face380
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/puppet-heat
+        hash: 9ddf5b2fef840f604a6109c6e18971b9930d7bc9
 branches:
   - name: stable/wallaby
     location: 18.4.0
+  - name: unmaintained/wallaby
+    location: wallaby-eom
 release-notes: https://docs.openstack.org/releasenotes/puppet-heat/wallaby.html
diff --git a/deliverables/wallaby/puppet-horizon.yaml b/deliverables/wallaby/puppet-horizon.yaml
index 6c11b57448..3cc55dc841 100644
--- a/deliverables/wallaby/puppet-horizon.yaml
+++ b/deliverables/wallaby/puppet-horizon.yaml
@@ -38,7 +38,14 @@ releases:
     projects:
       - repo: openstack/puppet-horizon
         hash: e768b149d5f6f3aa1627134fba7a0b9e9667ad1f
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/puppet-horizon
+        hash: a7058cae2e4373f009a6c97309223fd02ea7874b
 branches:
   - name: stable/wallaby
     location: 18.4.0
-release-notes: https://docs.openstack.org/releasenotes/puppet-horizon/wallaby.html
+  - name: unmaintained/wallaby
+    location: wallaby-eom
+release-notes:
+  https://docs.openstack.org/releasenotes/puppet-horizon/wallaby.html
diff --git a/deliverables/wallaby/puppet-ironic.yaml b/deliverables/wallaby/puppet-ironic.yaml
index 2d96de73be..b228e47458 100644
--- a/deliverables/wallaby/puppet-ironic.yaml
+++ b/deliverables/wallaby/puppet-ironic.yaml
@@ -42,7 +42,13 @@ releases:
     projects:
       - repo: openstack/puppet-ironic
         hash: 65869f8f510268fa1f2bf8cda04af415a340edd3
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/puppet-ironic
+        hash: e0c6a6b18d435ed2cad0302dcd9bffa5ba68c326
 branches:
   - name: stable/wallaby
     location: 18.4.0
+  - name: unmaintained/wallaby
+    location: wallaby-eom
 release-notes: https://docs.openstack.org/releasenotes/puppet-ironic/wallaby.html
diff --git a/deliverables/wallaby/puppet-keystone.yaml b/deliverables/wallaby/puppet-keystone.yaml
index 92ef4ebf30..4da1b2f971 100644
--- a/deliverables/wallaby/puppet-keystone.yaml
+++ b/deliverables/wallaby/puppet-keystone.yaml
@@ -38,7 +38,14 @@ releases:
     projects:
       - repo: openstack/puppet-keystone
         hash: e9796789afd1b6473959955e86c61de027a7f0a7
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/puppet-keystone
+        hash: e597c4e312f5e88eb69c0b5bf806b4c62d668703
 branches:
   - name: stable/wallaby
     location: 18.4.0
-release-notes: https://docs.openstack.org/releasenotes/puppet-keystone/wallaby.html
+  - name: unmaintained/wallaby
+    location: wallaby-eom
+release-notes:
+  https://docs.openstack.org/releasenotes/puppet-keystone/wallaby.html
diff --git a/deliverables/wallaby/puppet-magnum.yaml b/deliverables/wallaby/puppet-magnum.yaml
index 2dee2483e4..14769eb9e4 100644
--- a/deliverables/wallaby/puppet-magnum.yaml
+++ b/deliverables/wallaby/puppet-magnum.yaml
@@ -34,7 +34,13 @@ releases:
     projects:
       - repo: openstack/puppet-magnum
         hash: 000af77a1f423030989cfd4538d79dd2ebc4a954
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/puppet-magnum
+        hash: 60772fed27614fc4fe67e987c8babcfd977959da
 branches:
   - name: stable/wallaby
     location: 18.4.0
+  - name: unmaintained/wallaby
+    location: wallaby-eom
 release-notes: https://docs.openstack.org/releasenotes/puppet-magnum/wallaby.html
diff --git a/deliverables/wallaby/puppet-manila.yaml b/deliverables/wallaby/puppet-manila.yaml
index 23b8f40ae8..ef65d26016 100644
--- a/deliverables/wallaby/puppet-manila.yaml
+++ b/deliverables/wallaby/puppet-manila.yaml
@@ -38,7 +38,13 @@ releases:
     projects:
       - repo: openstack/puppet-manila
         hash: 3704aceefd0b178127e77429f6bb41a4fb03760a
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/puppet-manila
+        hash: a72a7d5ed9169da17741c22a01bbe191b4fbaf2a
 branches:
   - name: stable/wallaby
     location: 18.4.0
+  - name: unmaintained/wallaby
+    location: wallaby-eom
 release-notes: https://docs.openstack.org/releasenotes/puppet-manila/wallaby.html
diff --git a/deliverables/wallaby/puppet-mistral.yaml b/deliverables/wallaby/puppet-mistral.yaml
index c7ca9485c5..3e21366525 100644
--- a/deliverables/wallaby/puppet-mistral.yaml
+++ b/deliverables/wallaby/puppet-mistral.yaml
@@ -30,7 +30,14 @@ releases:
     projects:
       - repo: openstack/puppet-mistral
         hash: 6f5a30ace6e41c38aa40a3cebae906d8c59333dc
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/puppet-mistral
+        hash: db6fc1380aebb113a80cc75e031c739a2f383565
 branches:
   - name: stable/wallaby
     location: 18.4.0
-release-notes: https://docs.openstack.org/releasenotes/puppet-mistral/wallaby.html
+  - name: unmaintained/wallaby
+    location: wallaby-eom
+release-notes:
+  https://docs.openstack.org/releasenotes/puppet-mistral/wallaby.html
diff --git a/deliverables/wallaby/puppet-monasca.yaml b/deliverables/wallaby/puppet-monasca.yaml
index 29149104e6..b70c1dc444 100644
--- a/deliverables/wallaby/puppet-monasca.yaml
+++ b/deliverables/wallaby/puppet-monasca.yaml
@@ -32,7 +32,12 @@ releases:
     projects:
       - repo: openstack/puppet-monasca
         hash: 4a103c275e9fd6015c62b180f68e20749f8e550d
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/puppet-monasca
+        hash: 8240295540c5ec0d690b83a13987d1d8a63b5369
 branches:
   - name: stable/wallaby
     location: 7.4.0
-release-notes: https://docs.openstack.org/releasenotes/puppet-monasca/wallaby.html
+release-notes:
+  https://docs.openstack.org/releasenotes/puppet-monasca/wallaby.html
diff --git a/deliverables/wallaby/puppet-murano.yaml b/deliverables/wallaby/puppet-murano.yaml
index 4b24c867ec..435c9fa49a 100644
--- a/deliverables/wallaby/puppet-murano.yaml
+++ b/deliverables/wallaby/puppet-murano.yaml
@@ -32,7 +32,13 @@ releases:
     projects:
       - repo: openstack/puppet-murano
         hash: 8ceb65bf60ee2862698de7e52c6d7481bfae1108
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/puppet-murano
+        hash: 5ff418e59292ef7f9842b5ad154c1ab312a68a46
 branches:
   - name: stable/wallaby
     location: 18.4.0
+  - name: unmaintained/wallaby
+    location: wallaby-eom
 release-notes: https://docs.openstack.org/releasenotes/puppet-murano/wallaby.html
diff --git a/deliverables/wallaby/puppet-neutron.yaml b/deliverables/wallaby/puppet-neutron.yaml
index 13558b35d0..1b3970684d 100644
--- a/deliverables/wallaby/puppet-neutron.yaml
+++ b/deliverables/wallaby/puppet-neutron.yaml
@@ -38,7 +38,14 @@ releases:
     projects:
       - repo: openstack/puppet-neutron
         hash: 2094101f9be1075b58101299dffc87862919a685
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/puppet-neutron
+        hash: bdccc30975ee6e8c82370ab45eff3528cbd08ff1
 branches:
   - name: stable/wallaby
     location: 18.4.0
-release-notes: https://docs.openstack.org/releasenotes/puppet-neutron/wallaby.html
+  - name: unmaintained/wallaby
+    location: wallaby-eom
+release-notes:
+  https://docs.openstack.org/releasenotes/puppet-neutron/wallaby.html
diff --git a/deliverables/wallaby/puppet-nova.yaml b/deliverables/wallaby/puppet-nova.yaml
index 4e81f7a9d0..96d8f271ce 100644
--- a/deliverables/wallaby/puppet-nova.yaml
+++ b/deliverables/wallaby/puppet-nova.yaml
@@ -38,7 +38,13 @@ releases:
     projects:
       - repo: openstack/puppet-nova
         hash: c9fe15d977430a3fc1236cce21b40643cf90b02f
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/puppet-nova
+        hash: c6c0d21512ea7f9b9aecc218e43aa8d5fc492fc3
 branches:
   - name: stable/wallaby
     location: 18.4.0
+  - name: unmaintained/wallaby
+    location: wallaby-eom
 release-notes: https://docs.openstack.org/releasenotes/puppet-nova/wallaby.html
diff --git a/deliverables/wallaby/puppet-octavia.yaml b/deliverables/wallaby/puppet-octavia.yaml
index 52bb06adf8..0756acd56c 100644
--- a/deliverables/wallaby/puppet-octavia.yaml
+++ b/deliverables/wallaby/puppet-octavia.yaml
@@ -38,7 +38,14 @@ releases:
     projects:
       - repo: openstack/puppet-octavia
         hash: 35f7824b0b037427f7e976a5baa726f322c273e4
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/puppet-octavia
+        hash: c287bb28d488693ca7dc8903769a4feae00cb08f
 branches:
   - name: stable/wallaby
     location: 18.4.0
-release-notes: https://docs.openstack.org/releasenotes/puppet-octavia/wallaby.html
+  - name: unmaintained/wallaby
+    location: wallaby-eom
+release-notes:
+  https://docs.openstack.org/releasenotes/puppet-octavia/wallaby.html
diff --git a/deliverables/wallaby/puppet-openstack_extras.yaml b/deliverables/wallaby/puppet-openstack_extras.yaml
index 182c6c0630..20e051e9c4 100644
--- a/deliverables/wallaby/puppet-openstack_extras.yaml
+++ b/deliverables/wallaby/puppet-openstack_extras.yaml
@@ -34,7 +34,14 @@ releases:
     projects:
       - repo: openstack/puppet-openstack_extras
         hash: 3c2ac686c894d1bcf82a3cced2610b4799079f4f
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/puppet-openstack_extras
+        hash: 504e1a0f297c7fc57a194a73f84db7532a543cc7
 branches:
   - name: stable/wallaby
     location: 18.4.0
-release-notes: https://docs.openstack.org/releasenotes/puppet-openstack_extras/wallaby.html
+  - name: unmaintained/wallaby
+    location: wallaby-eom
+release-notes:
+  https://docs.openstack.org/releasenotes/puppet-openstack_extras/wallaby.html
diff --git a/deliverables/wallaby/puppet-openstacklib.yaml b/deliverables/wallaby/puppet-openstacklib.yaml
index 1d7df9d0b1..3c36d0582c 100644
--- a/deliverables/wallaby/puppet-openstacklib.yaml
+++ b/deliverables/wallaby/puppet-openstacklib.yaml
@@ -38,7 +38,14 @@ releases:
     projects:
       - repo: openstack/puppet-openstacklib
         hash: cccd34926c88e56c7c6a13f24516e523a3cabf6e
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/puppet-openstacklib
+        hash: 0ed3e66374fb37ee72140773d3ccb9a70e389175
 branches:
   - name: stable/wallaby
     location: 18.4.0
-release-notes: https://docs.openstack.org/releasenotes/puppet-openstacklib/wallaby.html
+  - name: unmaintained/wallaby
+    location: wallaby-eom
+release-notes:
+  https://docs.openstack.org/releasenotes/puppet-openstacklib/wallaby.html
diff --git a/deliverables/wallaby/puppet-oslo.yaml b/deliverables/wallaby/puppet-oslo.yaml
index f62b9e24fd..b52dc09782 100644
--- a/deliverables/wallaby/puppet-oslo.yaml
+++ b/deliverables/wallaby/puppet-oslo.yaml
@@ -38,7 +38,13 @@ releases:
     projects:
       - repo: openstack/puppet-oslo
         hash: b98fe2d6d4a8150e3a55e69abd5f48f60780249a
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/puppet-oslo
+        hash: a0f6611aefbf066d001a8f79420af0dd656eca67
 branches:
   - name: stable/wallaby
     location: 18.4.0
+  - name: unmaintained/wallaby
+    location: wallaby-eom
 release-notes: https://docs.openstack.org/releasenotes/puppet-oslo/wallaby.html
diff --git a/deliverables/wallaby/puppet-ovn.yaml b/deliverables/wallaby/puppet-ovn.yaml
index 6e3eaba213..b9fd3fef30 100644
--- a/deliverables/wallaby/puppet-ovn.yaml
+++ b/deliverables/wallaby/puppet-ovn.yaml
@@ -38,7 +38,13 @@ releases:
     projects:
       - repo: openstack/puppet-ovn
         hash: df9d0e7467be0ff86ab35f253eac0311a74ab89f
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/puppet-ovn
+        hash: 7805f7e0be9ea4217a3631fcd1e1d3e6eaf3dcd8
 branches:
   - name: stable/wallaby
     location: 18.4.0
+  - name: unmaintained/wallaby
+    location: wallaby-eom
 release-notes: https://docs.openstack.org/releasenotes/puppet-ovn/wallaby.html
diff --git a/deliverables/wallaby/puppet-panko.yaml b/deliverables/wallaby/puppet-panko.yaml
index d4e4b1ff02..c2b9dbe606 100644
--- a/deliverables/wallaby/puppet-panko.yaml
+++ b/deliverables/wallaby/puppet-panko.yaml
@@ -32,6 +32,10 @@ releases:
     projects:
       - repo: openstack/puppet-panko
         hash: c83a1d5b37cda0320470d6c9297dc1da5c028737
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/puppet-panko
+        hash: 7331ecdc1ee7d15304e34168f3658a31441c4469
 branches:
   - name: stable/wallaby
     location: 18.4.0
diff --git a/deliverables/wallaby/puppet-placement.yaml b/deliverables/wallaby/puppet-placement.yaml
index 82184fb985..c241a65c89 100644
--- a/deliverables/wallaby/puppet-placement.yaml
+++ b/deliverables/wallaby/puppet-placement.yaml
@@ -38,7 +38,14 @@ releases:
     projects:
       - repo: openstack/puppet-placement
         hash: 36ecdfd5f093977bc7154f023fa6c8b8b9267a05
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/puppet-placement
+        hash: df0557878dd75067caaa7d4a89940109911a482c
 branches:
   - name: stable/wallaby
     location: 5.4.0
-release-notes: https://docs.openstack.org/releasenotes/puppet-placement/wallaby.html
+  - name: unmaintained/wallaby
+    location: wallaby-eom
+release-notes:
+  https://docs.openstack.org/releasenotes/puppet-placement/wallaby.html
diff --git a/deliverables/wallaby/puppet-qdr.yaml b/deliverables/wallaby/puppet-qdr.yaml
index 293cabb9b9..22853f3b39 100644
--- a/deliverables/wallaby/puppet-qdr.yaml
+++ b/deliverables/wallaby/puppet-qdr.yaml
@@ -32,7 +32,13 @@ releases:
     projects:
       - repo: openstack/puppet-qdr
         hash: 34f6ed4dc6a05d677fb7ec8d773dfbb1ffe0c480
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/puppet-qdr
+        hash: 8a575de16680c7e8fce258c633ed75d6f62d29a3
 branches:
   - name: stable/wallaby
     location: 7.4.0
+  - name: unmaintained/wallaby
+    location: wallaby-eom
 release-notes: https://docs.openstack.org/releasenotes/puppet-qdr/wallaby.html
diff --git a/deliverables/wallaby/puppet-rally.yaml b/deliverables/wallaby/puppet-rally.yaml
index 85d04b6752..e1b0493ff4 100644
--- a/deliverables/wallaby/puppet-rally.yaml
+++ b/deliverables/wallaby/puppet-rally.yaml
@@ -32,6 +32,10 @@ releases:
     projects:
       - repo: openstack/puppet-rally
         hash: 60ceb112acd9e4a2a3b0e6b43556b97aad9caec6
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/puppet-rally
+        hash: 300c2b774cfa045b9641d47eb6502947bbe9bdc8
 branches:
   - name: stable/wallaby
     location: 6.4.0
diff --git a/deliverables/wallaby/puppet-sahara.yaml b/deliverables/wallaby/puppet-sahara.yaml
index 31133c4ce5..151ada5376 100644
--- a/deliverables/wallaby/puppet-sahara.yaml
+++ b/deliverables/wallaby/puppet-sahara.yaml
@@ -32,7 +32,13 @@ releases:
     projects:
       - repo: openstack/puppet-sahara
         hash: 8d30113a2a40e4f13d50b3c98df2e632f8582d08
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/puppet-sahara
+        hash: ae439d5cd7ef9ccd5de6ef413965068669fa307b
 branches:
   - name: stable/wallaby
     location: 18.4.0
+  - name: unmaintained/wallaby
+    location: wallaby-eom
 release-notes: https://docs.openstack.org/releasenotes/puppet-sahara/wallaby.html
diff --git a/deliverables/wallaby/puppet-senlin.yaml b/deliverables/wallaby/puppet-senlin.yaml
index 629b5e8f2e..7ea83ab83b 100644
--- a/deliverables/wallaby/puppet-senlin.yaml
+++ b/deliverables/wallaby/puppet-senlin.yaml
@@ -32,6 +32,10 @@ releases:
     projects:
       - repo: openstack/puppet-senlin
         hash: 9496da69b1a710a70429573315a35218f3fb57cb
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/puppet-senlin
+        hash: 89d19ca72dd39e793e4a5797718b23e8e1ef39de
 branches:
   - name: stable/wallaby
     location: 5.4.0
diff --git a/deliverables/wallaby/puppet-swift.yaml b/deliverables/wallaby/puppet-swift.yaml
index 0ac9c231ba..37b053d387 100644
--- a/deliverables/wallaby/puppet-swift.yaml
+++ b/deliverables/wallaby/puppet-swift.yaml
@@ -38,7 +38,13 @@ releases:
     projects:
       - repo: openstack/puppet-swift
         hash: c4e12034e1c002c336ac5e7760e8f2839690fdc4
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/puppet-swift
+        hash: 3e41d95091960c7d8a90befcb1d200a253335907
 branches:
   - name: stable/wallaby
     location: 18.4.0
+  - name: unmaintained/wallaby
+    location: wallaby-eom
 release-notes: https://docs.openstack.org/releasenotes/puppet-swift/wallaby.html
diff --git a/deliverables/wallaby/puppet-tacker.yaml b/deliverables/wallaby/puppet-tacker.yaml
index 937dbfc0fc..9b3832cf01 100644
--- a/deliverables/wallaby/puppet-tacker.yaml
+++ b/deliverables/wallaby/puppet-tacker.yaml
@@ -32,6 +32,10 @@ releases:
     projects:
       - repo: openstack/puppet-tacker
         hash: 68c3331e90743de0352f25d8841f4ee3340a76f4
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/puppet-tacker
+        hash: 1dcde391e7e93474484a8d20fd96d681a4a01ebf
 branches:
   - name: stable/wallaby
     location: 18.4.0
diff --git a/deliverables/wallaby/puppet-tempest.yaml b/deliverables/wallaby/puppet-tempest.yaml
index bac89b410f..c6cb63e080 100644
--- a/deliverables/wallaby/puppet-tempest.yaml
+++ b/deliverables/wallaby/puppet-tempest.yaml
@@ -38,7 +38,14 @@ releases:
     projects:
       - repo: openstack/puppet-tempest
         hash: 1276ff514a0775bb0a27ffb4f591106e7383d6ae
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/puppet-tempest
+        hash: 1276ff514a0775bb0a27ffb4f591106e7383d6ae
 branches:
   - name: stable/wallaby
     location: 18.4.0
-release-notes: https://docs.openstack.org/releasenotes/puppet-tempest/wallaby.html
+  - name: unmaintained/wallaby
+    location: wallaby-eom
+release-notes:
+  https://docs.openstack.org/releasenotes/puppet-tempest/wallaby.html
diff --git a/deliverables/wallaby/puppet-trove.yaml b/deliverables/wallaby/puppet-trove.yaml
index c727ac905b..3db59b24d8 100644
--- a/deliverables/wallaby/puppet-trove.yaml
+++ b/deliverables/wallaby/puppet-trove.yaml
@@ -30,7 +30,13 @@ releases:
     projects:
       - repo: openstack/puppet-trove
         hash: 8b9e0802b8c1fde4895edc0d8c59c6d52d48ea11
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/puppet-trove
+        hash: 1c180f650868f704e57414d7246ed160757dda95
 branches:
   - name: stable/wallaby
     location: 18.4.0
+  - name: unmaintained/wallaby
+    location: wallaby-eom
 release-notes: https://docs.openstack.org/releasenotes/puppet-trove/wallaby.html
diff --git a/deliverables/wallaby/puppet-vitrage.yaml b/deliverables/wallaby/puppet-vitrage.yaml
index 04d5436c5c..bda85fef13 100644
--- a/deliverables/wallaby/puppet-vitrage.yaml
+++ b/deliverables/wallaby/puppet-vitrage.yaml
@@ -30,7 +30,14 @@ releases:
     projects:
       - repo: openstack/puppet-vitrage
         hash: efb3e13790b354b435aac5cbbc4c8907d703226f
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/puppet-vitrage
+        hash: 5c7e016a48d8c54296c489d45297f5630af2e023
 branches:
   - name: stable/wallaby
     location: 8.4.0
-release-notes: https://docs.openstack.org/releasenotes/puppet-vitrage/wallaby.html
+  - name: unmaintained/wallaby
+    location: wallaby-eom
+release-notes:
+  https://docs.openstack.org/releasenotes/puppet-vitrage/wallaby.html
diff --git a/deliverables/wallaby/puppet-vswitch.yaml b/deliverables/wallaby/puppet-vswitch.yaml
index f6c3f7727c..d111877510 100644
--- a/deliverables/wallaby/puppet-vswitch.yaml
+++ b/deliverables/wallaby/puppet-vswitch.yaml
@@ -38,7 +38,14 @@ releases:
     projects:
       - repo: openstack/puppet-vswitch
         hash: 51e82ca53f11d55e20bed84a0dc9701b5c98b516
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/puppet-vswitch
+        hash: 51e82ca53f11d55e20bed84a0dc9701b5c98b516
 branches:
   - name: stable/wallaby
     location: 14.4.0
-release-notes: https://docs.openstack.org/releasenotes/puppet-vswitch/wallaby.html
+  - name: unmaintained/wallaby
+    location: wallaby-eom
+release-notes:
+  https://docs.openstack.org/releasenotes/puppet-vswitch/wallaby.html
diff --git a/deliverables/wallaby/puppet-watcher.yaml b/deliverables/wallaby/puppet-watcher.yaml
index 9f9269222a..b74c62f897 100644
--- a/deliverables/wallaby/puppet-watcher.yaml
+++ b/deliverables/wallaby/puppet-watcher.yaml
@@ -30,7 +30,14 @@ releases:
     projects:
       - repo: openstack/puppet-watcher
         hash: b45833efeabc1ccda5c52dc7c673cc5217b5ee86
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/puppet-watcher
+        hash: 27f86a240b284ac5ab9f330d4964fd3f71ef6040
 branches:
   - name: stable/wallaby
     location: 18.4.0
-release-notes: https://docs.openstack.org/releasenotes/puppet-watcher/wallaby.html
+  - name: unmaintained/wallaby
+    location: wallaby-eom
+release-notes:
+  https://docs.openstack.org/releasenotes/puppet-watcher/wallaby.html
diff --git a/deliverables/wallaby/puppet-zaqar.yaml b/deliverables/wallaby/puppet-zaqar.yaml
index ca4ca48dd3..5cbf4deaf7 100644
--- a/deliverables/wallaby/puppet-zaqar.yaml
+++ b/deliverables/wallaby/puppet-zaqar.yaml
@@ -30,7 +30,13 @@ releases:
     projects:
       - repo: openstack/puppet-zaqar
         hash: 5e707eb4f474d2852c4115f8cdf2016657282cfd
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/puppet-zaqar
+        hash: b5ea933ea359dcbc09d2e5802ffbb1284b48109c
 branches:
   - name: stable/wallaby
     location: 18.4.0
+  - name: unmaintained/wallaby
+    location: wallaby-eom
 release-notes: https://docs.openstack.org/releasenotes/puppet-zaqar/wallaby.html
diff --git a/deliverables/xena/puppet-aodh.yaml b/deliverables/xena/puppet-aodh.yaml
index b8fb892584..847842030e 100644
--- a/deliverables/xena/puppet-aodh.yaml
+++ b/deliverables/xena/puppet-aodh.yaml
@@ -30,7 +30,13 @@ releases:
     projects:
       - repo: openstack/puppet-aodh
         hash: 34b1688db1713221c00c90b36d494d58e1d8edd4
+  - version: xena-eom
+    projects:
+      - repo: openstack/puppet-aodh
+        hash: 2521ec80a44b0750c7a261e59909f5d6ba82d936
 branches:
   - name: stable/xena
     location: 19.4.0
+  - name: unmaintained/xena
+    location: xena-eom
 release-notes: https://docs.openstack.org/releasenotes/puppet-aodh/xena.html
diff --git a/deliverables/xena/puppet-barbican.yaml b/deliverables/xena/puppet-barbican.yaml
index b4dfb83f5a..25f515a8ed 100644
--- a/deliverables/xena/puppet-barbican.yaml
+++ b/deliverables/xena/puppet-barbican.yaml
@@ -34,7 +34,13 @@ releases:
     projects:
       - repo: openstack/puppet-barbican
         hash: c8ace6d685885696d697a3a5b6b634108bbfad07
+  - version: xena-eom
+    projects:
+      - repo: openstack/puppet-barbican
+        hash: c8ace6d685885696d697a3a5b6b634108bbfad07
 branches:
   - name: stable/xena
     location: 19.4.0
+  - name: unmaintained/xena
+    location: xena-eom
 release-notes: https://docs.openstack.org/releasenotes/puppet-barbican/xena.html
diff --git a/deliverables/xena/puppet-ceilometer.yaml b/deliverables/xena/puppet-ceilometer.yaml
index 329cbaba97..88eef90976 100644
--- a/deliverables/xena/puppet-ceilometer.yaml
+++ b/deliverables/xena/puppet-ceilometer.yaml
@@ -34,7 +34,14 @@ releases:
     projects:
       - repo: openstack/puppet-ceilometer
         hash: 842aaeb72ae6a2ccc67cd754554224d2e7653183
+  - version: xena-eom
+    projects:
+      - repo: openstack/puppet-ceilometer
+        hash: 78dbc6531f2bb895097567ebbeb81436b3768a9f
 branches:
   - name: stable/xena
     location: 19.4.0
-release-notes: https://docs.openstack.org/releasenotes/puppet-ceilometer/xena.html
+  - name: unmaintained/xena
+    location: xena-eom
+release-notes:
+  https://docs.openstack.org/releasenotes/puppet-ceilometer/xena.html
diff --git a/deliverables/xena/puppet-cinder.yaml b/deliverables/xena/puppet-cinder.yaml
index b79b60cc97..13cd8c0ebd 100644
--- a/deliverables/xena/puppet-cinder.yaml
+++ b/deliverables/xena/puppet-cinder.yaml
@@ -34,7 +34,13 @@ releases:
     projects:
       - repo: openstack/puppet-cinder
         hash: 8de77507c67f72948f5021b85cf02ae03c9bb89a
+  - version: xena-eom
+    projects:
+      - repo: openstack/puppet-cinder
+        hash: 8de77507c67f72948f5021b85cf02ae03c9bb89a
 branches:
   - name: stable/xena
     location: 19.4.0
+  - name: unmaintained/xena
+    location: xena-eom
 release-notes: https://docs.openstack.org/releasenotes/puppet-cinder/xena.html
diff --git a/deliverables/xena/puppet-cloudkitty.yaml b/deliverables/xena/puppet-cloudkitty.yaml
index c4f84d435b..b0ee4a1720 100644
--- a/deliverables/xena/puppet-cloudkitty.yaml
+++ b/deliverables/xena/puppet-cloudkitty.yaml
@@ -30,7 +30,14 @@ releases:
     projects:
       - repo: openstack/puppet-cloudkitty
         hash: 0de46143eb4222b776b3f1c91a98fd2071047eef
+  - version: xena-eom
+    projects:
+      - repo: openstack/puppet-cloudkitty
+        hash: ee88388a2d3f8076b6d75a0903b8889ca779980b
 branches:
   - name: stable/xena
     location: 8.4.0
-release-notes: https://docs.openstack.org/releasenotes/puppet-cloudkitty/xena.html
+  - name: unmaintained/xena
+    location: xena-eom
+release-notes:
+  https://docs.openstack.org/releasenotes/puppet-cloudkitty/xena.html
diff --git a/deliverables/xena/puppet-designate.yaml b/deliverables/xena/puppet-designate.yaml
index 1dae9c520a..996e6ece26 100644
--- a/deliverables/xena/puppet-designate.yaml
+++ b/deliverables/xena/puppet-designate.yaml
@@ -34,7 +34,13 @@ releases:
     projects:
       - repo: openstack/puppet-designate
         hash: 734e498ac69fb0ef8d7cd4e66f66102aae655d08
+  - version: xena-eom
+    projects:
+      - repo: openstack/puppet-designate
+        hash: 734e498ac69fb0ef8d7cd4e66f66102aae655d08
 branches:
   - name: stable/xena
     location: 19.4.0
+  - name: unmaintained/xena
+    location: xena-eom
 release-notes: https://docs.openstack.org/releasenotes/puppet-designate/xena.html
diff --git a/deliverables/xena/puppet-ec2api.yaml b/deliverables/xena/puppet-ec2api.yaml
index e167adcb00..fd0af7ad74 100644
--- a/deliverables/xena/puppet-ec2api.yaml
+++ b/deliverables/xena/puppet-ec2api.yaml
@@ -32,7 +32,13 @@ releases:
     projects:
       - repo: openstack/puppet-ec2api
         hash: f74f33e5d78a4c01e8580c9558b7d8a5b5488afc
+  - version: xena-eom
+    projects:
+      - repo: openstack/puppet-ec2api
+        hash: f9d8d562638fa217944c1c7deb7d4711d0de9613
 branches:
   - name: stable/xena
     location: 19.4.0
+  - name: unmaintained/xena
+    location: xena-eom
 release-notes: https://docs.openstack.org/releasenotes/puppet-ec2api/xena.html
diff --git a/deliverables/xena/puppet-glance.yaml b/deliverables/xena/puppet-glance.yaml
index f3c3f9eae3..5fc5062fa3 100644
--- a/deliverables/xena/puppet-glance.yaml
+++ b/deliverables/xena/puppet-glance.yaml
@@ -34,7 +34,13 @@ releases:
     projects:
       - repo: openstack/puppet-glance
         hash: cbbeee8feb5bd67596fd3c28dce62bbcf574439e
+  - version: xena-eom
+    projects:
+      - repo: openstack/puppet-glance
+        hash: cbbeee8feb5bd67596fd3c28dce62bbcf574439e
 branches:
   - name: stable/xena
     location: 19.4.0
+  - name: unmaintained/xena
+    location: xena-eom
 release-notes: https://docs.openstack.org/releasenotes/puppet-glance/xena.html
diff --git a/deliverables/xena/puppet-gnocchi.yaml b/deliverables/xena/puppet-gnocchi.yaml
index bb62dfdb3e..1c5f6d5f0b 100644
--- a/deliverables/xena/puppet-gnocchi.yaml
+++ b/deliverables/xena/puppet-gnocchi.yaml
@@ -34,7 +34,13 @@ releases:
     projects:
       - repo: openstack/puppet-gnocchi
         hash: fdc70e210ffcfd7937dcd53a3d9b24c824685abe
+  - version: xena-eom
+    projects:
+      - repo: openstack/puppet-gnocchi
+        hash: fdc70e210ffcfd7937dcd53a3d9b24c824685abe
 branches:
   - name: stable/xena
     location: 19.4.0
+  - name: unmaintained/xena
+    location: xena-eom
 release-notes: https://docs.openstack.org/releasenotes/puppet-gnocchi/xena.html
diff --git a/deliverables/xena/puppet-heat.yaml b/deliverables/xena/puppet-heat.yaml
index a0a2d56249..0dc9b532f1 100644
--- a/deliverables/xena/puppet-heat.yaml
+++ b/deliverables/xena/puppet-heat.yaml
@@ -34,7 +34,13 @@ releases:
     projects:
       - repo: openstack/puppet-heat
         hash: 30c1b53ef28b7a0187d9d7e4479ea4b27c112d33
+  - version: xena-eom
+    projects:
+      - repo: openstack/puppet-heat
+        hash: 30c1b53ef28b7a0187d9d7e4479ea4b27c112d33
 branches:
   - name: stable/xena
     location: 19.4.0
+  - name: unmaintained/xena
+    location: xena-eom
 release-notes: https://docs.openstack.org/releasenotes/puppet-heat/xena.html
diff --git a/deliverables/xena/puppet-horizon.yaml b/deliverables/xena/puppet-horizon.yaml
index c5a96f4af1..a5fa462e46 100644
--- a/deliverables/xena/puppet-horizon.yaml
+++ b/deliverables/xena/puppet-horizon.yaml
@@ -34,7 +34,13 @@ releases:
     projects:
       - repo: openstack/puppet-horizon
         hash: 1300d5230dc797f1b2d310522fb9eca27c6f9442
+  - version: xena-eom
+    projects:
+      - repo: openstack/puppet-horizon
+        hash: 1300d5230dc797f1b2d310522fb9eca27c6f9442
 branches:
   - name: stable/xena
     location: 19.4.0
+  - name: unmaintained/xena
+    location: xena-eom
 release-notes: https://docs.openstack.org/releasenotes/puppet-horizon/xena.html
diff --git a/deliverables/xena/puppet-ironic.yaml b/deliverables/xena/puppet-ironic.yaml
index 742b1c1f73..7ad0761ebe 100644
--- a/deliverables/xena/puppet-ironic.yaml
+++ b/deliverables/xena/puppet-ironic.yaml
@@ -34,7 +34,13 @@ releases:
     projects:
       - repo: openstack/puppet-ironic
         hash: 1af3df3eeb44a39c8d96c60510b14f27d675408a
+  - version: xena-eom
+    projects:
+      - repo: openstack/puppet-ironic
+        hash: 1af3df3eeb44a39c8d96c60510b14f27d675408a
 branches:
   - name: stable/xena
     location: 19.4.0
+  - name: unmaintained/xena
+    location: xena-eom
 release-notes: https://docs.openstack.org/releasenotes/puppet-ironic/xena.html
diff --git a/deliverables/xena/puppet-keystone.yaml b/deliverables/xena/puppet-keystone.yaml
index ace2fe3226..1ec5f301c7 100644
--- a/deliverables/xena/puppet-keystone.yaml
+++ b/deliverables/xena/puppet-keystone.yaml
@@ -34,7 +34,13 @@ releases:
     projects:
       - repo: openstack/puppet-keystone
         hash: 16883a6cee52c3936c1149d358701000c942ac69
+  - version: xena-eom
+    projects:
+      - repo: openstack/puppet-keystone
+        hash: 11dbf38cfda264caf046626027557761077c5b4b
 branches:
   - name: stable/xena
     location: 19.4.0
+  - name: unmaintained/xena
+    location: xena-eom
 release-notes: https://docs.openstack.org/releasenotes/puppet-keystone/xena.html
diff --git a/deliverables/xena/puppet-magnum.yaml b/deliverables/xena/puppet-magnum.yaml
index 42b7e03614..105d45ca02 100644
--- a/deliverables/xena/puppet-magnum.yaml
+++ b/deliverables/xena/puppet-magnum.yaml
@@ -30,7 +30,13 @@ releases:
     projects:
       - repo: openstack/puppet-magnum
         hash: 1c14963e28634de6bb9b2b90f3fddc13f3bde3b5
+  - version: xena-eom
+    projects:
+      - repo: openstack/puppet-magnum
+        hash: 867d769d6bff3d38f2461f5c17a2ebec00086c50
 branches:
   - name: stable/xena
     location: 19.4.0
+  - name: unmaintained/xena
+    location: xena-eom
 release-notes: https://docs.openstack.org/releasenotes/puppet-magnum/xena.html
diff --git a/deliverables/xena/puppet-manila.yaml b/deliverables/xena/puppet-manila.yaml
index 7e59094c65..bfcfcbab12 100644
--- a/deliverables/xena/puppet-manila.yaml
+++ b/deliverables/xena/puppet-manila.yaml
@@ -34,7 +34,13 @@ releases:
     projects:
       - repo: openstack/puppet-manila
         hash: 58e5da769adef35b2e6bb2bc1c9adf007c12a9f3
+  - version: xena-eom
+    projects:
+      - repo: openstack/puppet-manila
+        hash: 58e5da769adef35b2e6bb2bc1c9adf007c12a9f3
 branches:
   - name: stable/xena
     location: 19.4.0
+  - name: unmaintained/xena
+    location: xena-eom
 release-notes: https://docs.openstack.org/releasenotes/puppet-manila/xena.html
diff --git a/deliverables/xena/puppet-mistral.yaml b/deliverables/xena/puppet-mistral.yaml
index daf9b01b0f..e982efd503 100644
--- a/deliverables/xena/puppet-mistral.yaml
+++ b/deliverables/xena/puppet-mistral.yaml
@@ -34,7 +34,13 @@ releases:
     projects:
       - repo: openstack/puppet-mistral
         hash: 23c7017929fa89147d3d55ca479208be28173e7f
+  - version: xena-eom
+    projects:
+      - repo: openstack/puppet-mistral
+        hash: 23c7017929fa89147d3d55ca479208be28173e7f
 branches:
   - name: stable/xena
     location: 19.4.0
+  - name: unmaintained/xena
+    location: xena-eom
 release-notes: https://docs.openstack.org/releasenotes/puppet-mistral/xena.html
diff --git a/deliverables/xena/puppet-murano.yaml b/deliverables/xena/puppet-murano.yaml
index c07b1d038b..1a6ba8347b 100644
--- a/deliverables/xena/puppet-murano.yaml
+++ b/deliverables/xena/puppet-murano.yaml
@@ -32,7 +32,13 @@ releases:
     projects:
       - repo: openstack/puppet-murano
         hash: 117c42ad1ce47af9faa7302efcc1195b3534fd00
+  - version: xena-eom
+    projects:
+      - repo: openstack/puppet-murano
+        hash: 902077a9f15b54d63ee062901ccaa84d316b6cff
 branches:
   - name: stable/xena
     location: 19.4.0
+  - name: unmaintained/xena
+    location: xena-eom
 release-notes: https://docs.openstack.org/releasenotes/puppet-murano/xena.html
diff --git a/deliverables/xena/puppet-neutron.yaml b/deliverables/xena/puppet-neutron.yaml
index 71bbdd4be5..cc17c1b97d 100644
--- a/deliverables/xena/puppet-neutron.yaml
+++ b/deliverables/xena/puppet-neutron.yaml
@@ -34,7 +34,13 @@ releases:
     projects:
       - repo: openstack/puppet-neutron
         hash: 7008f718ee1b6765b5846644a3ec68048ae75107
+  - version: xena-eom
+    projects:
+      - repo: openstack/puppet-neutron
+        hash: 7008f718ee1b6765b5846644a3ec68048ae75107
 branches:
   - name: stable/xena
     location: 19.4.0
+  - name: unmaintained/xena
+    location: xena-eom
 release-notes: https://docs.openstack.org/releasenotes/puppet-neutron/xena.html
diff --git a/deliverables/xena/puppet-nova.yaml b/deliverables/xena/puppet-nova.yaml
index 0d99078dec..5a5ca496ff 100644
--- a/deliverables/xena/puppet-nova.yaml
+++ b/deliverables/xena/puppet-nova.yaml
@@ -34,7 +34,13 @@ releases:
     projects:
       - repo: openstack/puppet-nova
         hash: 9b412fde58d6f715ab73baf726f85eae9949623b
+  - version: xena-eom
+    projects:
+      - repo: openstack/puppet-nova
+        hash: eabbcd391ee1122db44ef27bb8ad1aa79da2d5dc
 branches:
   - name: stable/xena
     location: 19.4.0
+  - name: unmaintained/xena
+    location: xena-eom
 release-notes: https://docs.openstack.org/releasenotes/puppet-nova/xena.html
diff --git a/deliverables/xena/puppet-octavia.yaml b/deliverables/xena/puppet-octavia.yaml
index d86038f713..f30815fa5c 100644
--- a/deliverables/xena/puppet-octavia.yaml
+++ b/deliverables/xena/puppet-octavia.yaml
@@ -34,7 +34,13 @@ releases:
     projects:
       - repo: openstack/puppet-octavia
         hash: 6262ebb064179ad42e5c122538c4f401744e5100
+  - version: xena-eom
+    projects:
+      - repo: openstack/puppet-octavia
+        hash: 6262ebb064179ad42e5c122538c4f401744e5100
 branches:
   - name: stable/xena
     location: 19.4.0
+  - name: unmaintained/xena
+    location: xena-eom
 release-notes: https://docs.openstack.org/releasenotes/puppet-octavia/xena.html
diff --git a/deliverables/xena/puppet-openstack_extras.yaml b/deliverables/xena/puppet-openstack_extras.yaml
index 73c41156e3..2e167ccf8d 100644
--- a/deliverables/xena/puppet-openstack_extras.yaml
+++ b/deliverables/xena/puppet-openstack_extras.yaml
@@ -34,7 +34,14 @@ releases:
     projects:
       - repo: openstack/puppet-openstack_extras
         hash: 8160f0bb7423cd972d629f08425f58895ee2faca
+  - version: xena-eom
+    projects:
+      - repo: openstack/puppet-openstack_extras
+        hash: 8160f0bb7423cd972d629f08425f58895ee2faca
 branches:
   - name: stable/xena
     location: 19.4.0
-release-notes: https://docs.openstack.org/releasenotes/puppet-openstack_extras/xena.html
+  - name: unmaintained/xena
+    location: xena-eom
+release-notes:
+  https://docs.openstack.org/releasenotes/puppet-openstack_extras/xena.html
diff --git a/deliverables/xena/puppet-openstacklib.yaml b/deliverables/xena/puppet-openstacklib.yaml
index 147c3b8a01..57eea704e4 100644
--- a/deliverables/xena/puppet-openstacklib.yaml
+++ b/deliverables/xena/puppet-openstacklib.yaml
@@ -34,7 +34,14 @@ releases:
     projects:
       - repo: openstack/puppet-openstacklib
         hash: f8ead08cef0ed6267594527fbe7c4bfee5c2467e
+  - version: xena-eom
+    projects:
+      - repo: openstack/puppet-openstacklib
+        hash: f8ead08cef0ed6267594527fbe7c4bfee5c2467e
 branches:
   - name: stable/xena
     location: 19.4.0
-release-notes: https://docs.openstack.org/releasenotes/puppet-openstacklib/xena.html
+  - name: unmaintained/xena
+    location: xena-eom
+release-notes:
+  https://docs.openstack.org/releasenotes/puppet-openstacklib/xena.html
diff --git a/deliverables/xena/puppet-oslo.yaml b/deliverables/xena/puppet-oslo.yaml
index 6662dc29b5..b343ce366b 100644
--- a/deliverables/xena/puppet-oslo.yaml
+++ b/deliverables/xena/puppet-oslo.yaml
@@ -34,7 +34,13 @@ releases:
     projects:
       - repo: openstack/puppet-oslo
         hash: 8e59bdd0d04139f9b0971090ac979a8558e4dc29
+  - version: xena-eom
+    projects:
+      - repo: openstack/puppet-oslo
+        hash: 8e59bdd0d04139f9b0971090ac979a8558e4dc29
 branches:
   - name: stable/xena
     location: 19.4.0
+  - name: unmaintained/xena
+    location: xena-eom
 release-notes: https://docs.openstack.org/releasenotes/puppet-oslo/xena.html
diff --git a/deliverables/xena/puppet-ovn.yaml b/deliverables/xena/puppet-ovn.yaml
index ce0f850d59..e164416631 100644
--- a/deliverables/xena/puppet-ovn.yaml
+++ b/deliverables/xena/puppet-ovn.yaml
@@ -34,7 +34,13 @@ releases:
     projects:
       - repo: openstack/puppet-ovn
         hash: f648d1a689bfce58da606e9dfc5b702e297ed038
+  - version: xena-eom
+    projects:
+      - repo: openstack/puppet-ovn
+        hash: f648d1a689bfce58da606e9dfc5b702e297ed038
 branches:
   - name: stable/xena
     location: 19.4.0
+  - name: unmaintained/xena
+    location: xena-eom
 release-notes: https://docs.openstack.org/releasenotes/puppet-ovn/xena.html
diff --git a/deliverables/xena/puppet-placement.yaml b/deliverables/xena/puppet-placement.yaml
index 2c3c6e1105..5138751a97 100644
--- a/deliverables/xena/puppet-placement.yaml
+++ b/deliverables/xena/puppet-placement.yaml
@@ -34,7 +34,13 @@ releases:
     projects:
       - repo: openstack/puppet-placement
         hash: 8096fe49d416d8cddf4847a2a67165aadefb2525
+  - version: xena-eom
+    projects:
+      - repo: openstack/puppet-placement
+        hash: 8096fe49d416d8cddf4847a2a67165aadefb2525
 branches:
   - name: stable/xena
     location: 6.4.0
+  - name: unmaintained/xena
+    location: xena-eom
 release-notes: https://docs.openstack.org/releasenotes/puppet-placement/xena.html
diff --git a/deliverables/xena/puppet-qdr.yaml b/deliverables/xena/puppet-qdr.yaml
index e3d6a7778b..a51fcdd3f7 100644
--- a/deliverables/xena/puppet-qdr.yaml
+++ b/deliverables/xena/puppet-qdr.yaml
@@ -32,7 +32,13 @@ releases:
     projects:
       - repo: openstack/puppet-qdr
         hash: b7374739795711d01ccd2e8c8cf03e6c5491cfc3
+  - version: xena-eom
+    projects:
+      - repo: openstack/puppet-qdr
+        hash: 3f392614d03ea738a4da56bb474ce5f31f6d32f3
 branches:
   - name: stable/xena
     location: 8.4.0
+  - name: unmaintained/xena
+    location: xena-eom
 release-notes: https://docs.openstack.org/releasenotes/puppet-qdr/xena.html
diff --git a/deliverables/xena/puppet-rally.yaml b/deliverables/xena/puppet-rally.yaml
index 885d336a77..92def97400 100644
--- a/deliverables/xena/puppet-rally.yaml
+++ b/deliverables/xena/puppet-rally.yaml
@@ -32,6 +32,10 @@ releases:
     projects:
       - repo: openstack/puppet-rally
         hash: c8b2eabac168b2363c13314da55e0a44dea360c2
+  - version: xena-eol
+    projects:
+      - repo: openstack/puppet-rally
+        hash: 4c58583745118c44e1536e96fa25e1605c27a226
 branches:
   - name: stable/xena
     location: 7.4.0
diff --git a/deliverables/xena/puppet-sahara.yaml b/deliverables/xena/puppet-sahara.yaml
index 4905cddce3..2def8ff49b 100644
--- a/deliverables/xena/puppet-sahara.yaml
+++ b/deliverables/xena/puppet-sahara.yaml
@@ -32,7 +32,13 @@ releases:
     projects:
       - repo: openstack/puppet-sahara
         hash: db33f6cbb2dd7d282e31a0284b912341c9a7c31f
+  - version: xena-eom
+    projects:
+      - repo: openstack/puppet-sahara
+        hash: 8a1edfe493df7c467bee60e2c1ea009e7c95e45b
 branches:
   - name: stable/xena
     location: 19.4.0
+  - name: unmaintained/xena
+    location: xena-eom
 release-notes: https://docs.openstack.org/releasenotes/puppet-sahara/xena.html
diff --git a/deliverables/xena/puppet-senlin.yaml b/deliverables/xena/puppet-senlin.yaml
index e7748caaf6..02b8407f1d 100644
--- a/deliverables/xena/puppet-senlin.yaml
+++ b/deliverables/xena/puppet-senlin.yaml
@@ -32,6 +32,10 @@ releases:
     projects:
       - repo: openstack/puppet-senlin
         hash: 01a41dfc97f17b65fed4d318e7974443cc9ac349
+  - version: xena-eol
+    projects:
+      - repo: openstack/puppet-senlin
+        hash: b6618e458e41c2e416f0b1967116a170f51540ff
 branches:
   - name: stable/xena
     location: 6.4.0
diff --git a/deliverables/xena/puppet-swift.yaml b/deliverables/xena/puppet-swift.yaml
index 55d996cf4b..3b4ec3bd0b 100644
--- a/deliverables/xena/puppet-swift.yaml
+++ b/deliverables/xena/puppet-swift.yaml
@@ -34,7 +34,13 @@ releases:
     projects:
       - repo: openstack/puppet-swift
         hash: 65a08a54aa70c9b80cc8a203f7f61a22a79b370c
+  - version: xena-eom
+    projects:
+      - repo: openstack/puppet-swift
+        hash: 65a08a54aa70c9b80cc8a203f7f61a22a79b370c
 branches:
   - name: stable/xena
     location: 19.4.0
+  - name: unmaintained/xena
+    location: xena-eom
 release-notes: https://docs.openstack.org/releasenotes/puppet-swift/xena.html
diff --git a/deliverables/xena/puppet-tacker.yaml b/deliverables/xena/puppet-tacker.yaml
index 40af36da1f..2664337697 100644
--- a/deliverables/xena/puppet-tacker.yaml
+++ b/deliverables/xena/puppet-tacker.yaml
@@ -32,6 +32,10 @@ releases:
     projects:
       - repo: openstack/puppet-tacker
         hash: 27bcf13c7e918dce4bb5079824d25d9f363438a5
+  - version: xena-eol
+    projects:
+      - repo: openstack/puppet-tacker
+        hash: 73be414d66d404b7394df12cb7861ebe18ce0510
 branches:
   - name: stable/xena
     location: 19.4.0
diff --git a/deliverables/xena/puppet-tempest.yaml b/deliverables/xena/puppet-tempest.yaml
index 3c0f3baa6b..1d7301c3bf 100644
--- a/deliverables/xena/puppet-tempest.yaml
+++ b/deliverables/xena/puppet-tempest.yaml
@@ -38,7 +38,13 @@ releases:
     projects:
       - repo: openstack/puppet-tempest
         hash: ebe69173a0c8a91f5f0ddd1cf5cbdbb2e05c96d3
+  - version: xena-eom
+    projects:
+      - repo: openstack/puppet-tempest
+        hash: ebe69173a0c8a91f5f0ddd1cf5cbdbb2e05c96d3
 branches:
   - name: stable/xena
     location: 19.4.0
+  - name: unmaintained/xena
+    location: xena-eom
 release-notes: https://docs.openstack.org/releasenotes/puppet-tempest/xena.html
diff --git a/deliverables/xena/puppet-trove.yaml b/deliverables/xena/puppet-trove.yaml
index c15d4fc8a8..00e4e18cf2 100644
--- a/deliverables/xena/puppet-trove.yaml
+++ b/deliverables/xena/puppet-trove.yaml
@@ -30,7 +30,13 @@ releases:
     projects:
       - repo: openstack/puppet-trove
         hash: 1cadc20de097bfc7f14c200437305773db566783
+  - version: xena-eom
+    projects:
+      - repo: openstack/puppet-trove
+        hash: 5b6ad03310c300daf2ecfb9b904c3d66dcd9692b
 branches:
   - name: stable/xena
     location: 19.4.0
+  - name: unmaintained/xena
+    location: xena-eom
 release-notes: https://docs.openstack.org/releasenotes/puppet-trove/xena.html
diff --git a/deliverables/xena/puppet-vitrage.yaml b/deliverables/xena/puppet-vitrage.yaml
index 578e709f96..6dfed12c01 100644
--- a/deliverables/xena/puppet-vitrage.yaml
+++ b/deliverables/xena/puppet-vitrage.yaml
@@ -34,7 +34,13 @@ releases:
     projects:
       - repo: openstack/puppet-vitrage
         hash: ba4eb4117a092b6cee783a373f900c838adfdbeb
+  - version: xena-eom
+    projects:
+      - repo: openstack/puppet-vitrage
+        hash: ba4eb4117a092b6cee783a373f900c838adfdbeb
 branches:
   - name: stable/xena
     location: 9.4.0
+  - name: unmaintained/xena
+    location: xena-eom
 release-notes: https://docs.openstack.org/releasenotes/puppet-vitrage/xena.html
diff --git a/deliverables/xena/puppet-vswitch.yaml b/deliverables/xena/puppet-vswitch.yaml
index 9116d77502..c5a2fd571c 100644
--- a/deliverables/xena/puppet-vswitch.yaml
+++ b/deliverables/xena/puppet-vswitch.yaml
@@ -34,7 +34,13 @@ releases:
     projects:
       - repo: openstack/puppet-vswitch
         hash: aea7e211f51d76eb9d2c5a6a6f0e50a539d5fba0
+  - version: xena-eom
+    projects:
+      - repo: openstack/puppet-vswitch
+        hash: aea7e211f51d76eb9d2c5a6a6f0e50a539d5fba0
 branches:
   - name: stable/xena
     location: 15.4.0
+  - name: unmaintained/xena
+    location: xena-eom
 release-notes: https://docs.openstack.org/releasenotes/puppet-vswitch/xena.html
diff --git a/deliverables/xena/puppet-watcher.yaml b/deliverables/xena/puppet-watcher.yaml
index 480a6ef114..c27515a17a 100644
--- a/deliverables/xena/puppet-watcher.yaml
+++ b/deliverables/xena/puppet-watcher.yaml
@@ -30,7 +30,13 @@ releases:
     projects:
       - repo: openstack/puppet-watcher
         hash: 170bff1c8d09b5a6ddb9aec07f4591a4c79dd678
+  - version: xena-eom
+    projects:
+      - repo: openstack/puppet-watcher
+        hash: c0dffc21d1fde1df29bea0a583a5e9578a6dcc94
 branches:
   - name: stable/xena
     location: 19.4.0
+  - name: unmaintained/xena
+    location: xena-eom
 release-notes: https://docs.openstack.org/releasenotes/puppet-watcher/xena.html
diff --git a/deliverables/xena/puppet-zaqar.yaml b/deliverables/xena/puppet-zaqar.yaml
index 06ef1a32b6..7586859999 100644
--- a/deliverables/xena/puppet-zaqar.yaml
+++ b/deliverables/xena/puppet-zaqar.yaml
@@ -30,7 +30,13 @@ releases:
     projects:
       - repo: openstack/puppet-zaqar
         hash: efdaf91e88b15d11e4bc4ac9976fe03c7615b58f
+  - version: xena-eom
+    projects:
+      - repo: openstack/puppet-zaqar
+        hash: a4481a864c12dc33f8da4c788a5ccf15311708ac
 branches:
   - name: stable/xena
     location: 19.4.0
+  - name: unmaintained/xena
+    location: xena-eom
 release-notes: https://docs.openstack.org/releasenotes/puppet-zaqar/xena.html