diff --git a/deliverables/wallaby/automaton.yaml b/deliverables/wallaby/automaton.yaml
index 42b3efef9a..c3502ab4c8 100644
--- a/deliverables/wallaby/automaton.yaml
+++ b/deliverables/wallaby/automaton.yaml
@@ -23,9 +23,14 @@ releases:
     projects:
       - repo: openstack/automaton
         hash: 4a3e5397e1278a891627452750e3e68ac1919de1
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/automaton
+        hash: 4a3e5397e1278a891627452750e3e68ac1919de1
 branches:
   - name: stable/wallaby
     location: 2.3.0
   - name: unmaintained/wallaby
     location: wallaby-eom
-release-notes: https://docs.openstack.org/releasenotes/automaton/wallaby.html
+release-notes:
+  https://docs.openstack.org/releasenotes/automaton/wallaby.html
diff --git a/deliverables/wallaby/barbican.yaml b/deliverables/wallaby/barbican.yaml
index 6478f23f96..2bd1adce51 100644
--- a/deliverables/wallaby/barbican.yaml
+++ b/deliverables/wallaby/barbican.yaml
@@ -35,9 +35,14 @@ releases:
     projects:
       - repo: openstack/barbican
         hash: 6ee5ad91635b41c3ab891602942b1b809a25ace6
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/barbican
+        hash: 6ee5ad91635b41c3ab891602942b1b809a25ace6
 branches:
   - name: stable/wallaby
     location: 12.0.0.0rc1
   - name: unmaintained/wallaby
     location: wallaby-eom
-release-notes: https://docs.openstack.org/releasenotes/barbican/wallaby.html
+release-notes:
+  https://docs.openstack.org/releasenotes/barbican/wallaby.html
diff --git a/deliverables/wallaby/castellan.yaml b/deliverables/wallaby/castellan.yaml
index 6d02292628..d7400e9b34 100644
--- a/deliverables/wallaby/castellan.yaml
+++ b/deliverables/wallaby/castellan.yaml
@@ -26,9 +26,14 @@ releases:
     projects:
       - repo: openstack/castellan
         hash: 3775cf425396776ae401a5560ae1dfa55a429116
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/castellan
+        hash: ce7ad477ae740ca0b43441829d4a456bf9322656
 branches:
   - name: stable/wallaby
     location: 3.7.1
   - name: unmaintained/wallaby
     location: wallaby-eom
-release-notes: https://docs.openstack.org/releasenotes/castellan/wallaby.html
+release-notes:
+  https://docs.openstack.org/releasenotes/castellan/wallaby.html
diff --git a/deliverables/wallaby/cinder.yaml b/deliverables/wallaby/cinder.yaml
index de72d253f4..95f01d048b 100644
--- a/deliverables/wallaby/cinder.yaml
+++ b/deliverables/wallaby/cinder.yaml
@@ -56,9 +56,14 @@ releases:
     projects:
       - repo: openstack/cinder
         hash: f6b44fc201c3e679d70367fd588304d7a8cbf420
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/cinder
+        hash: 9875e4bc1d6b21be24253a52b5e40deb24748744
 branches:
   - name: stable/wallaby
     location: 18.0.0.0rc1
   - name: unmaintained/wallaby
     location: wallaby-eom
-release-notes: https://docs.openstack.org/releasenotes/cinder/wallaby.html
+release-notes:
+  https://docs.openstack.org/releasenotes/cinder/wallaby.html
diff --git a/deliverables/wallaby/cinderlib.yaml b/deliverables/wallaby/cinderlib.yaml
index b5c8c88e24..8d17e1bd49 100644
--- a/deliverables/wallaby/cinderlib.yaml
+++ b/deliverables/wallaby/cinderlib.yaml
@@ -18,9 +18,14 @@ releases:
     projects:
       - repo: openstack/cinderlib
         hash: 03441bf1baef2f99fe1a6c754f9098e58fd9f54d
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/cinderlib
+        hash: 592cc260c93f93966d37b5b7867df73daedf1ed9
 branches:
   - location: 4.0.0
     name: stable/wallaby
   - name: unmaintained/wallaby
     location: wallaby-eom
-release-notes: https://docs.openstack.org/releasenotes/cinderlib/wallaby.html
+release-notes:
+  https://docs.openstack.org/releasenotes/cinderlib/wallaby.html
diff --git a/deliverables/wallaby/devstack-plugin-container.yaml b/deliverables/wallaby/devstack-plugin-container.yaml
index 8e10896640..ef94b2b9b6 100644
--- a/deliverables/wallaby/devstack-plugin-container.yaml
+++ b/deliverables/wallaby/devstack-plugin-container.yaml
@@ -6,7 +6,8 @@ type: other
 stable-branch-type: tagless
 branches:
   - location:
-      openstack/devstack-plugin-container: d4de1bb9905aebff7e3620d08aa65dc334d435b8
+      openstack/devstack-plugin-container:
+        d4de1bb9905aebff7e3620d08aa65dc334d435b8
     name: stable/wallaby
   - name: unmaintained/wallaby
     location: wallaby-eom
@@ -17,3 +18,7 @@ releases:
     projects:
       - repo: openstack/devstack-plugin-container
         hash: 6ba48627e046a7c06d9bc33e70419c3cbc3a4025
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/devstack-plugin-container
+        hash: 5a6502673a8415f77b9750aa256f709b119c0566
diff --git a/deliverables/wallaby/devstack.yaml b/deliverables/wallaby/devstack.yaml
index 9005817328..0554110861 100644
--- a/deliverables/wallaby/devstack.yaml
+++ b/deliverables/wallaby/devstack.yaml
@@ -17,3 +17,7 @@ releases:
     projects:
       - repo: openstack/devstack
         hash: ec783f0b044012d3d7e1410d3b599e67fc9dd624
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/devstack
+        hash: 8488c9342b43e544fa4dc9638ed7e60b97526fb8
diff --git a/deliverables/wallaby/glance-store.yaml b/deliverables/wallaby/glance-store.yaml
index 9a88bf05cd..cbf53d112e 100644
--- a/deliverables/wallaby/glance-store.yaml
+++ b/deliverables/wallaby/glance-store.yaml
@@ -27,6 +27,10 @@ releases:
     projects:
       - repo: openstack/glance_store
         hash: 5f1cee6fa90268b17c7b6f842854a3b27e44994c
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/glance_store
+        hash: e7060befe487d31d2bd40d232f736b83859318b9
 branches:
   - name: stable/wallaby
     location: 2.5.0
diff --git a/deliverables/wallaby/glance.yaml b/deliverables/wallaby/glance.yaml
index d25cd75e07..1c5eb9a20a 100644
--- a/deliverables/wallaby/glance.yaml
+++ b/deliverables/wallaby/glance.yaml
@@ -6,8 +6,8 @@ release-model: cycle-with-rc
 team: glance
 type: service
 cycle-highlights:
-  - New API /v2/images/<image-id>/tasks to get tasks associated with
-    image
+  - New API /v2/images/<image-id>/tasks to get tasks associated
+    with image
   - Support for distributed image import
   - Secure RBAC - Experimental support for project personas
   - Cleanup of stale files in staging area upon service startup
@@ -47,9 +47,14 @@ releases:
     projects:
       - repo: openstack/glance
         hash: 883fc8a73c6db3aafeae947465ec9868d23c7538
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/glance
+        hash: 883fc8a73c6db3aafeae947465ec9868d23c7538
 branches:
   - name: stable/wallaby
     location: 22.0.0.0rc1
   - name: unmaintained/wallaby
     location: wallaby-eom
-release-notes: https://docs.openstack.org/releasenotes/glance/wallaby.html
+release-notes:
+  https://docs.openstack.org/releasenotes/glance/wallaby.html
diff --git a/deliverables/wallaby/grenade.yaml b/deliverables/wallaby/grenade.yaml
index c7334a0993..161ce8e65e 100644
--- a/deliverables/wallaby/grenade.yaml
+++ b/deliverables/wallaby/grenade.yaml
@@ -17,3 +17,7 @@ releases:
     projects:
       - repo: openstack/grenade
         hash: e280e4d4f1b5ba019478f36fd2a6f7c5bb276a76
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/grenade
+        hash: 2c83fc5d06fca7f24a2b9486cc62af460a383896
diff --git a/deliverables/wallaby/heat-agents.yaml b/deliverables/wallaby/heat-agents.yaml
index 093ba49fa9..6dcef400ef 100644
--- a/deliverables/wallaby/heat-agents.yaml
+++ b/deliverables/wallaby/heat-agents.yaml
@@ -19,9 +19,14 @@ releases:
     projects:
       - repo: openstack/heat-agents
         hash: ed16cc7dd7ac774e20cf5d63b97b1ae42393c458
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/heat-agents
+        hash: 70ad0a61a38886c67758b9088eab419a6f279787
 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
+release-notes:
+  https://docs.openstack.org/releasenotes/heat-agents/wallaby.html
diff --git a/deliverables/wallaby/heat.yaml b/deliverables/wallaby/heat.yaml
index b617dbefbb..3ef3a059dc 100644
--- a/deliverables/wallaby/heat.yaml
+++ b/deliverables/wallaby/heat.yaml
@@ -29,9 +29,14 @@ releases:
     projects:
       - repo: openstack/heat
         hash: edc6d60327491fa2f5395a488cff4e27536db006
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/heat
+        hash: 14b26c6b8a4c1bcdb45ea41e6feba19cdd677a47
 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
+release-notes:
+  https://docs.openstack.org/releasenotes/heat/wallaby.html
diff --git a/deliverables/wallaby/horizon.yaml b/deliverables/wallaby/horizon.yaml
index 6e82aaa083..e16c04ccb8 100644
--- a/deliverables/wallaby/horizon.yaml
+++ b/deliverables/wallaby/horizon.yaml
@@ -6,13 +6,14 @@ type: service
 repository-settings:
   openstack/horizon: {}
 cycle-highlights:
-  - Horizon supports the registered default policies. Now operators
-    do not need to define all the policies in the policy file instead
-    define only those policy they would like to override.
-  - Chinese locales ``zh-cn`` and ``zh-tw`` have been changed to ``zh-hans``
-    and ``zh-hant`` respectively following the change in Django because
-    the new locales decouple what is spoken from specific locations
-    as they are also used outside of China.
+  - Horizon supports the registered default policies. Now
+    operators do not need to define all the policies in the policy
+    file instead define only those policy they would like to
+    override.
+  - Chinese locales ``zh-cn`` and ``zh-tw`` have been changed to
+    ``zh-hans`` and ``zh-hant`` respectively following the change
+    in Django because the new locales decouple what is spoken from
+    specific locations as they are also used outside of China.
   - Added Volume backups support for admin.
 releases:
   - version: 19.0.0
@@ -43,9 +44,14 @@ releases:
     projects:
       - repo: openstack/horizon
         hash: 9b1a13e0837b9f0ac3e0e919ad0a270d417003db
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/horizon
+        hash: 1a7795d6fed0ae7ff598f22b84ac3e113f6d17b5
 branches:
   - name: stable/wallaby
     location: 19.1.0
   - name: unmaintained/wallaby
     location: wallaby-eom
-release-notes: https://docs.openstack.org/releasenotes/horizon/wallaby.html
+release-notes:
+  https://docs.openstack.org/releasenotes/horizon/wallaby.html
diff --git a/deliverables/wallaby/ironic-lib.yaml b/deliverables/wallaby/ironic-lib.yaml
index fffd983ecd..a867f2a8aa 100644
--- a/deliverables/wallaby/ironic-lib.yaml
+++ b/deliverables/wallaby/ironic-lib.yaml
@@ -39,6 +39,10 @@ releases:
     projects:
       - repo: openstack/ironic-lib
         hash: 5a9995e5671d12070f8215bc0da22e338204ea4b
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/ironic-lib
+        hash: 7b7a8f2cd9426ad6b286bc87997e68ddcb4b3b97
 branches:
   - name: stable/wallaby
     location: 4.6.1
diff --git a/deliverables/wallaby/ironic-prometheus-exporter.yaml b/deliverables/wallaby/ironic-prometheus-exporter.yaml
index 9bf0743f6a..07dbd97231 100644
--- a/deliverables/wallaby/ironic-prometheus-exporter.yaml
+++ b/deliverables/wallaby/ironic-prometheus-exporter.yaml
@@ -19,6 +19,10 @@ releases:
     projects:
       - repo: openstack/ironic-prometheus-exporter
         hash: 6c44a6408f89693806954f1685f36e3cbaee983f
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/ironic-prometheus-exporter
+        hash: d88f61424c029fe39df4ff600f2a7ac39762d9b0
 branches:
   - name: stable/wallaby
     location: 2.2.0
diff --git a/deliverables/wallaby/ironic-python-agent.yaml b/deliverables/wallaby/ironic-python-agent.yaml
index d091431fec..b3fba8c8e7 100644
--- a/deliverables/wallaby/ironic-python-agent.yaml
+++ b/deliverables/wallaby/ironic-python-agent.yaml
@@ -40,6 +40,10 @@ releases:
     projects:
       - repo: openstack/ironic-python-agent
         hash: 0211fa9c4f4cd0b6ce65f80fdf7ab798a838cce4
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/ironic-python-agent
+        hash: 1622362097ea1957641e4674e1ff27b5613b4a5a
 branches:
   - name: bugfix/6.5
     location: 6.5.0
diff --git a/deliverables/wallaby/ironic-ui.yaml b/deliverables/wallaby/ironic-ui.yaml
index 2a5eee826b..1a16ffde79 100644
--- a/deliverables/wallaby/ironic-ui.yaml
+++ b/deliverables/wallaby/ironic-ui.yaml
@@ -19,9 +19,14 @@ releases:
     projects:
       - repo: openstack/ironic-ui
         hash: 98f31e49e2c916bc56baaaffe717ca3ab7adce87
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/ironic-ui
+        hash: 92d0ad3e7c63eabca69097df5b2664651dd47668
 branches:
   - name: stable/wallaby
     location: 4.3.0
   - name: unmaintained/wallaby
     location: wallaby-eom
-release-notes: https://docs.openstack.org/releasenotes/ironic-ui/wallaby.html
+release-notes:
+  https://docs.openstack.org/releasenotes/ironic-ui/wallaby.html
diff --git a/deliverables/wallaby/ironic.yaml b/deliverables/wallaby/ironic.yaml
index 0a0c1a8f7f..4e33a269a1 100644
--- a/deliverables/wallaby/ironic.yaml
+++ b/deliverables/wallaby/ironic.yaml
@@ -47,6 +47,10 @@ releases:
     projects:
       - repo: openstack/ironic
         hash: 663a97f8c39ad212603168b1369ca778e5b9aaef
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/ironic
+        hash: a3b59814706424debd3848d2e7cd79566b646619
 branches:
   - name: bugfix/16.1
     location: 16.1.0
@@ -57,12 +61,16 @@ branches:
   - name: unmaintained/wallaby
     location: wallaby-eom
 cycle-highlights:
-  - Redfish capability enhancements covering Out of Band hardware RAID
-    configuration, and automatic Secure Boot setting enablement.
-  - Deployment and Cleaning enhancements including UEFI Partition Image
-    handling, NVMe Secure Erase, per-instance deployment driver interface
-    overrides, deploy time "deploy_steps", and file injection.
-  - The ``System`` scoped RBAC model is now supported by Ironic along
-    with the ``admin``, ``member``, and ``reader`` roles. This work
-    has resulted in over 1500 new unit tests being added to Ironic.
-release-notes: https://docs.openstack.org/releasenotes/ironic/wallaby.html
+  - Redfish capability enhancements covering Out of Band hardware
+    RAID configuration, and automatic Secure Boot setting
+    enablement.
+  - Deployment and Cleaning enhancements including UEFI Partition
+    Image handling, NVMe Secure Erase, per-instance deployment
+    driver interface overrides, deploy time "deploy_steps", and
+    file injection.
+  - The ``System`` scoped RBAC model is now supported by Ironic
+    along with the ``admin``, ``member``, and ``reader`` roles.
+    This work has resulted in over 1500 new unit tests being added
+    to Ironic.
+release-notes:
+  https://docs.openstack.org/releasenotes/ironic/wallaby.html
diff --git a/deliverables/wallaby/keystone.yaml b/deliverables/wallaby/keystone.yaml
index 546f699d9b..7ea007bab4 100644
--- a/deliverables/wallaby/keystone.yaml
+++ b/deliverables/wallaby/keystone.yaml
@@ -31,9 +31,14 @@ releases:
     projects:
       - repo: openstack/keystone
         hash: 8c5d283af91478e1203491d656ae6b236e2d84fb
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/keystone
+        hash: c2ee7c78c75c0a62cec1cad4eb2efbcfbdaafa0e
 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
+release-notes:
+  https://docs.openstack.org/releasenotes/keystone/wallaby.html
diff --git a/deliverables/wallaby/keystoneauth.yaml b/deliverables/wallaby/keystoneauth.yaml
index 29b23206eb..8580de15b7 100644
--- a/deliverables/wallaby/keystoneauth.yaml
+++ b/deliverables/wallaby/keystoneauth.yaml
@@ -24,9 +24,14 @@ releases:
     projects:
       - repo: openstack/keystoneauth
         hash: 2504ca98bfe8459f0fdc3e7c9510c8c663055b90
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/keystoneauth
+        hash: 3b3952829679a9b8698e25722976f8ffc1533c1c
 branches:
   - name: stable/wallaby
     location: 4.3.1
   - name: unmaintained/wallaby
     location: wallaby-eom
-release-notes: https://docs.openstack.org/releasenotes/keystoneauth/wallaby.html
+release-notes:
+  https://docs.openstack.org/releasenotes/keystoneauth/wallaby.html
diff --git a/deliverables/wallaby/keystonemiddleware.yaml b/deliverables/wallaby/keystonemiddleware.yaml
index 207feabf55..5a0b802df5 100644
--- a/deliverables/wallaby/keystonemiddleware.yaml
+++ b/deliverables/wallaby/keystonemiddleware.yaml
@@ -19,6 +19,10 @@ releases:
     projects:
       - repo: openstack/keystonemiddleware
         hash: 2ea733ee0f1fa103d34344cdf618ea322ab229e8
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/keystonemiddleware
+        hash: b5b56a9946a0ebf1f928743f2a2919fd4907e353
 branches:
   - name: stable/wallaby
     location: 9.2.0
diff --git a/deliverables/wallaby/networking-bgpvpn.yaml b/deliverables/wallaby/networking-bgpvpn.yaml
index be01ba364e..a4c7c2ddb4 100644
--- a/deliverables/wallaby/networking-bgpvpn.yaml
+++ b/deliverables/wallaby/networking-bgpvpn.yaml
@@ -24,6 +24,10 @@ releases:
     projects:
       - repo: openstack/networking-bgpvpn
         hash: 188121ae61f16656b721485147e6feb98201bb99
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/networking-bgpvpn
+        hash: 188121ae61f16656b721485147e6feb98201bb99
 branches:
   - name: stable/wallaby
     location: 14.0.0.0rc1
diff --git a/deliverables/wallaby/neutron-lib.yaml b/deliverables/wallaby/neutron-lib.yaml
index 96090bf3a7..21dbf83707 100644
--- a/deliverables/wallaby/neutron-lib.yaml
+++ b/deliverables/wallaby/neutron-lib.yaml
@@ -43,9 +43,14 @@ releases:
     projects:
       - repo: openstack/neutron-lib
         hash: 619c0fe5345af66061730ce763a1cd45c353f37c
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/neutron-lib
+        hash: 2ec873233a3174a105f50652a10d3daf957bd1e4
 branches:
   - name: stable/wallaby
     location: 2.10.1
   - name: unmaintained/wallaby
     location: wallaby-eom
-release-notes: https://docs.openstack.org/releasenotes/neutron-lib/wallaby.html
+release-notes:
+  https://docs.openstack.org/releasenotes/neutron-lib/wallaby.html
diff --git a/deliverables/wallaby/neutron.yaml b/deliverables/wallaby/neutron.yaml
index b0476a6ad1..1bd56e766a 100644
--- a/deliverables/wallaby/neutron.yaml
+++ b/deliverables/wallaby/neutron.yaml
@@ -6,22 +6,23 @@ release-model: cycle-with-rc
 repository-settings:
   openstack/neutron: {}
 cycle-highlights:
-  - New subnet type ``network:routed`` is now available. IPs of such
-    subnet can be advertized with BGP over a provider network. This
-    basically achieves a BGP-to-the-rack feature, where the L2 connectivity
-    can be confined to a rack only, and all external routing is done
-    by the switches, using BGP. In this mode, it is still possible to
-    use VXLAN connectivity between the compute nodes, and only floating
-    IPs and router gateways are using BGP routing.
-  - A port already bound with a QoS minimum_bandwidth rule can now be
-    updated with a new QoS policy with a minimum_bandwidth rule. It
-    will change the allocations in placement as well.
-  - A new vnic type ``vdpa`` has been added to allow requesting port
-    that utilize a vHost-vDPA offload. It is supported by ML2/OVS and
-    ML2/OVN mech drivers currently.
+  - New subnet type ``network:routed`` is now available. IPs of
+    such subnet can be advertized with BGP over a provider
+    network. This basically achieves a BGP-to-the-rack feature,
+    where the L2 connectivity can be confined to a rack only, and
+    all external routing is done by the switches, using BGP. In
+    this mode, it is still possible to use VXLAN connectivity
+    between the compute nodes, and only floating IPs and router
+    gateways are using BGP routing.
+  - A port already bound with a QoS minimum_bandwidth rule can now
+    be updated with a new QoS policy with a minimum_bandwidth
+    rule. It will change the allocations in placement as well.
+  - A new vnic type ``vdpa`` has been added to allow requesting
+    port that utilize a vHost-vDPA offload. It is supported by
+    ML2/OVS and ML2/OVN mech drivers currently.
   - Deletion of the ML2/OVN agents is now supported.
-  - New resource ``address-groups`` can be used in the ``security group
-    rules`` to add group of the IP addresses to the rule.
+  - New resource ``address-groups`` can be used in the ``security
+    group rules`` to add group of the IP addresses to the rule.
 releases:
   - version: 18.0.0.0rc1
     projects:
@@ -72,9 +73,14 @@ releases:
     projects:
       - repo: openstack/neutron
         hash: 3ef44ac244a9be77ebe03684f0c79ad7e24ea57e
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/neutron
+        hash: 453c81d27bc3901ed727fedf6e986785e98e27b6
 branches:
   - name: stable/wallaby
     location: 18.0.0.0rc1
   - name: unmaintained/wallaby
     location: wallaby-eom
-release-notes: https://docs.openstack.org/releasenotes/neutron/wallaby.html
+release-notes:
+  https://docs.openstack.org/releasenotes/neutron/wallaby.html
diff --git a/deliverables/wallaby/nova.yaml b/deliverables/wallaby/nova.yaml
index beba7ffbd8..18e26bde4b 100644
--- a/deliverables/wallaby/nova.yaml
+++ b/deliverables/wallaby/nova.yaml
@@ -77,9 +77,14 @@ releases:
     projects:
       - repo: openstack/nova
         hash: 05848fbbb2132ef34df14da6f059d3165734e1ca
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/nova
+        hash: c1496c493a883506cb577f719c70c90abc1e749b
 branches:
   - name: stable/wallaby
     location: 23.0.0.0rc1
   - name: unmaintained/wallaby
     location: wallaby-eom
-release-notes: https://docs.openstack.org/releasenotes/nova/wallaby.html
+release-notes:
+  https://docs.openstack.org/releasenotes/nova/wallaby.html
diff --git a/deliverables/wallaby/openstacksdk.yaml b/deliverables/wallaby/openstacksdk.yaml
index d9bac6cc67..4c981ae94b 100644
--- a/deliverables/wallaby/openstacksdk.yaml
+++ b/deliverables/wallaby/openstacksdk.yaml
@@ -39,9 +39,14 @@ releases:
     projects:
       - repo: openstack/openstacksdk
         hash: f48f90bee4557851e06890c029c56a9d6545207a
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/openstacksdk
+        hash: 79e610b2c00c50850a377f0df242180442db6c9f
 branches:
   - name: stable/wallaby
     location: 0.55.0
   - name: unmaintained/wallaby
     location: wallaby-eom
-release-notes: https://docs.openstack.org/releasenotes/openstacksdk/wallaby.html
+release-notes:
+  https://docs.openstack.org/releasenotes/openstacksdk/wallaby.html
diff --git a/deliverables/wallaby/os-brick.yaml b/deliverables/wallaby/os-brick.yaml
index d571770576..ca70f4b24a 100644
--- a/deliverables/wallaby/os-brick.yaml
+++ b/deliverables/wallaby/os-brick.yaml
@@ -43,9 +43,14 @@ releases:
     projects:
       - repo: openstack/os-brick
         hash: 5dcda6b961fa765c817f94a782a6fff48295c89a
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/os-brick
+        hash: a8dc617224048bdf5413b470c488624a3546b2f1
 branches:
   - location: 4.3.0
     name: stable/wallaby
   - name: unmaintained/wallaby
     location: wallaby-eom
-release-notes: https://docs.openstack.org/releasenotes/os-brick/wallaby.html
+release-notes:
+  https://docs.openstack.org/releasenotes/os-brick/wallaby.html
diff --git a/deliverables/wallaby/os-ken.yaml b/deliverables/wallaby/os-ken.yaml
index d0e8ea3854..7de732ba02 100644
--- a/deliverables/wallaby/os-ken.yaml
+++ b/deliverables/wallaby/os-ken.yaml
@@ -27,9 +27,14 @@ releases:
     projects:
       - repo: openstack/os-ken
         hash: 018d755fd7426902256891f39cb21b51d52b7f17
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/os-ken
+        hash: 6b336c0cbc45060ae41632374a07f856c95ed6ce
 branches:
   - name: stable/wallaby
     location: 1.4.0
   - name: unmaintained/wallaby
     location: wallaby-eom
-release-notes: https://docs.openstack.org/releasenotes/os-ken/wallaby.html
+release-notes:
+  https://docs.openstack.org/releasenotes/os-ken/wallaby.html
diff --git a/deliverables/wallaby/os-vif.yaml b/deliverables/wallaby/os-vif.yaml
index 4d2d5eeb94..68c0488619 100644
--- a/deliverables/wallaby/os-vif.yaml
+++ b/deliverables/wallaby/os-vif.yaml
@@ -28,9 +28,14 @@ releases:
     projects:
       - repo: openstack/os-vif
         hash: bac7f7d9d4337c60bf684d5b518c79f9aff95771
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/os-vif
+        hash: 6e257d3ba80970d81bbe4b5a43a26efade27126f
 branches:
   - name: stable/wallaby
     location: 2.4.0
   - name: unmaintained/wallaby
     location: wallaby-eom
-release-notes: https://docs.openstack.org/releasenotes/os-vif/wallaby.html
+release-notes:
+  https://docs.openstack.org/releasenotes/os-vif/wallaby.html
diff --git a/deliverables/wallaby/osc-lib.yaml b/deliverables/wallaby/osc-lib.yaml
index 70c3a2202e..a81e6bbbaa 100644
--- a/deliverables/wallaby/osc-lib.yaml
+++ b/deliverables/wallaby/osc-lib.yaml
@@ -23,9 +23,14 @@ releases:
     projects:
       - repo: openstack/osc-lib
         hash: ba61c4f5c32f99f45d67db3aba07eeaf4908661c
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/osc-lib
+        hash: b44c3c7749ac00957b52926fd5105925c718fb75
 branches:
   - name: stable/wallaby
     location: 2.3.1
   - name: unmaintained/wallaby
     location: wallaby-eom
-release-notes: https://docs.openstack.org/releasenotes/osc-lib/wallaby.html
+release-notes:
+  https://docs.openstack.org/releasenotes/osc-lib/wallaby.html
diff --git a/deliverables/wallaby/osc-placement.yaml b/deliverables/wallaby/osc-placement.yaml
index b49bc1866d..f106612ff2 100644
--- a/deliverables/wallaby/osc-placement.yaml
+++ b/deliverables/wallaby/osc-placement.yaml
@@ -19,9 +19,14 @@ releases:
     projects:
       - repo: openstack/osc-placement
         hash: 3336df3e009a49ae6377dbda4f69cc7327a4d2aa
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/osc-placement
+        hash: 3336df3e009a49ae6377dbda4f69cc7327a4d2aa
 branches:
   - name: stable/wallaby
     location: 2.2.0
   - name: unmaintained/wallaby
     location: wallaby-eom
-release-notes: https://docs.openstack.org/releasenotes/osc-placement/wallaby.html
+release-notes:
+  https://docs.openstack.org/releasenotes/osc-placement/wallaby.html
diff --git a/deliverables/wallaby/oslo.cache.yaml b/deliverables/wallaby/oslo.cache.yaml
index 508be85c18..8fd757a883 100644
--- a/deliverables/wallaby/oslo.cache.yaml
+++ b/deliverables/wallaby/oslo.cache.yaml
@@ -23,9 +23,14 @@ releases:
     projects:
       - repo: openstack/oslo.cache
         hash: d0252f62f3b61253d0bcd953329f7b52e53c6e81
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/oslo.cache
+        hash: 2bf17532df4bfebc8c4c8075c8188bff8e534dfe
 branches:
   - name: stable/wallaby
     location: 2.7.0
   - name: unmaintained/wallaby
     location: wallaby-eom
-release-notes: https://docs.openstack.org/releasenotes/oslo.cache/wallaby.html
+release-notes:
+  https://docs.openstack.org/releasenotes/oslo.cache/wallaby.html
diff --git a/deliverables/wallaby/oslo.config.yaml b/deliverables/wallaby/oslo.config.yaml
index 9c35069004..24c6c6312c 100644
--- a/deliverables/wallaby/oslo.config.yaml
+++ b/deliverables/wallaby/oslo.config.yaml
@@ -27,9 +27,14 @@ releases:
     projects:
       - repo: openstack/oslo.config
         hash: 03a2344d8de0c213f6b3453b5d357a53d6b313d4
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/oslo.config
+        hash: 98a4ab6420b1dae77beaf499e26c190916353845
 branches:
   - name: stable/wallaby
     location: 8.5.0
   - name: unmaintained/wallaby
     location: wallaby-eom
-release-notes: https://docs.openstack.org/releasenotes/oslo.config/wallaby.html
+release-notes:
+  https://docs.openstack.org/releasenotes/oslo.config/wallaby.html
diff --git a/deliverables/wallaby/oslo.context.yaml b/deliverables/wallaby/oslo.context.yaml
index 22995fd3e1..d8df7c7493 100644
--- a/deliverables/wallaby/oslo.context.yaml
+++ b/deliverables/wallaby/oslo.context.yaml
@@ -23,9 +23,14 @@ releases:
     projects:
       - repo: openstack/oslo.context
         hash: b124eb7df2617be56a23819f670bd6e054f87ce7
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/oslo.context
+        hash: d72463851b3930b620f34b8d374bf8a88c5ed27c
 branches:
   - name: stable/wallaby
     location: 3.2.0
   - name: unmaintained/wallaby
     location: wallaby-eom
-release-notes: https://docs.openstack.org/releasenotes/oslo.context/wallaby.html
+release-notes:
+  https://docs.openstack.org/releasenotes/oslo.context/wallaby.html
diff --git a/deliverables/wallaby/oslo.db.yaml b/deliverables/wallaby/oslo.db.yaml
index c283104f20..91a2498f35 100644
--- a/deliverables/wallaby/oslo.db.yaml
+++ b/deliverables/wallaby/oslo.db.yaml
@@ -27,9 +27,14 @@ releases:
     projects:
       - repo: openstack/oslo.db
         hash: 26fd6fbc1ca4229c81a99937979aa2628e8f5e33
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/oslo.db
+        hash: 5f7af14d64710ad64ab14ba6c7a243d13db5f93d
 branches:
   - name: stable/wallaby
     location: 8.5.0
   - name: unmaintained/wallaby
     location: wallaby-eom
-release-notes: https://docs.openstack.org/releasenotes/oslo.db/wallaby.html
+release-notes:
+  https://docs.openstack.org/releasenotes/oslo.db/wallaby.html
diff --git a/deliverables/wallaby/oslo.limit.yaml b/deliverables/wallaby/oslo.limit.yaml
index 6d3b215c8c..1c47351f0f 100644
--- a/deliverables/wallaby/oslo.limit.yaml
+++ b/deliverables/wallaby/oslo.limit.yaml
@@ -23,9 +23,14 @@ releases:
     projects:
       - repo: openstack/oslo.limit
         hash: 7fb94507056499878be5c03c7972ac8449873816
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/oslo.limit
+        hash: 7fb94507056499878be5c03c7972ac8449873816
 branches:
   - name: stable/wallaby
     location: 1.3.0
   - name: unmaintained/wallaby
     location: wallaby-eom
-release-notes: https://docs.openstack.org/releasenotes/oslo.limit/wallaby.html
+release-notes:
+  https://docs.openstack.org/releasenotes/oslo.limit/wallaby.html
diff --git a/deliverables/wallaby/oslo.messaging.yaml b/deliverables/wallaby/oslo.messaging.yaml
index 3b629195df..424c27cb69 100644
--- a/deliverables/wallaby/oslo.messaging.yaml
+++ b/deliverables/wallaby/oslo.messaging.yaml
@@ -39,6 +39,10 @@ releases:
     projects:
       - repo: openstack/oslo.messaging
         hash: 51121d125525e67deae62490b7002a11ccd5ff4c
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/oslo.messaging
+        hash: b368c16db83b580bc7bd5dac5fe52221a88f5bd8
 branches:
   - name: stable/wallaby
     location: 12.7.1
diff --git a/deliverables/wallaby/oslo.metrics.yaml b/deliverables/wallaby/oslo.metrics.yaml
index ba6aa787c7..d6482b6c4a 100644
--- a/deliverables/wallaby/oslo.metrics.yaml
+++ b/deliverables/wallaby/oslo.metrics.yaml
@@ -25,6 +25,10 @@ releases:
     projects:
       - repo: openstack/oslo.metrics
         hash: ff38ac6fffca85181de31607cd5a060e2f66ff8c
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/oslo.metrics
+        hash: ff38ac6fffca85181de31607cd5a060e2f66ff8c
 repository-settings:
   openstack/oslo.metrics: {}
 branches:
@@ -32,4 +36,5 @@ branches:
     location: 0.2.1
   - name: unmaintained/wallaby
     location: wallaby-eom
-release-notes: https://docs.openstack.org/releasenotes/oslo.metrics/wallaby.html
+release-notes:
+  https://docs.openstack.org/releasenotes/oslo.metrics/wallaby.html
diff --git a/deliverables/wallaby/oslo.middleware.yaml b/deliverables/wallaby/oslo.middleware.yaml
index 86af960f35..b0e5e3b6b9 100644
--- a/deliverables/wallaby/oslo.middleware.yaml
+++ b/deliverables/wallaby/oslo.middleware.yaml
@@ -23,6 +23,10 @@ releases:
     projects:
       - repo: openstack/oslo.middleware
         hash: b40ca5f7c83462dee043f812aaf515eee12bc7fb
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/oslo.middleware
+        hash: ea1ca525ea682b7734a02def1066b87b028d5e5c
 branches:
   - name: stable/wallaby
     location: 4.2.0
diff --git a/deliverables/wallaby/oslo.policy.yaml b/deliverables/wallaby/oslo.policy.yaml
index 6083d43f9e..1f1e4a3c23 100644
--- a/deliverables/wallaby/oslo.policy.yaml
+++ b/deliverables/wallaby/oslo.policy.yaml
@@ -35,9 +35,14 @@ releases:
     projects:
       - repo: openstack/oslo.policy
         hash: de7f51e0eb743b9d29424b7cc600cf73bec638e0
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/oslo.policy
+        hash: 89b6f78f092d6c93dfad42a4e85b9e5d62ed83a2
 branches:
   - name: stable/wallaby
     location: 3.7.0
   - name: unmaintained/wallaby
     location: wallaby-eom
-release-notes: https://docs.openstack.org/releasenotes/oslo.policy/wallaby.html
+release-notes:
+  https://docs.openstack.org/releasenotes/oslo.policy/wallaby.html
diff --git a/deliverables/wallaby/oslo.privsep.yaml b/deliverables/wallaby/oslo.privsep.yaml
index ae9e516a31..598674b0e7 100644
--- a/deliverables/wallaby/oslo.privsep.yaml
+++ b/deliverables/wallaby/oslo.privsep.yaml
@@ -23,9 +23,14 @@ releases:
     projects:
       - repo: openstack/oslo.privsep
         hash: 1634c00ce251e80581a337522c85c1d5836bbf16
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/oslo.privsep
+        hash: b62b41f265f89d4ee706e6acf727f06da4652f00
 branches:
   - name: stable/wallaby
     location: 2.5.0
   - name: unmaintained/wallaby
     location: wallaby-eom
-release-notes: https://docs.openstack.org/releasenotes/oslo.privsep/wallaby.html
+release-notes:
+  https://docs.openstack.org/releasenotes/oslo.privsep/wallaby.html
diff --git a/deliverables/wallaby/oslo.serialization.yaml b/deliverables/wallaby/oslo.serialization.yaml
index a4205d388f..2791715d2f 100644
--- a/deliverables/wallaby/oslo.serialization.yaml
+++ b/deliverables/wallaby/oslo.serialization.yaml
@@ -23,6 +23,10 @@ releases:
     projects:
       - repo: openstack/oslo.serialization
         hash: bbe5d5a4f072b3bf986511fa6dd0a9bf2b21e00c
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/oslo.serialization
+        hash: 8651af5a650af7d7d35f29accb2e5ba61343bc96
 branches:
   - name: stable/wallaby
     location: 4.1.0
diff --git a/deliverables/wallaby/oslo.service.yaml b/deliverables/wallaby/oslo.service.yaml
index 0e62cbf177..009e5dc71b 100644
--- a/deliverables/wallaby/oslo.service.yaml
+++ b/deliverables/wallaby/oslo.service.yaml
@@ -23,9 +23,14 @@ releases:
     projects:
       - repo: openstack/oslo.service
         hash: 04d55fc02c005ea3aaa950702610e225a17208cf
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/oslo.service
+        hash: 04d55fc02c005ea3aaa950702610e225a17208cf
 branches:
   - name: stable/wallaby
     location: 2.5.0
   - name: unmaintained/wallaby
     location: wallaby-eom
-release-notes: https://docs.openstack.org/releasenotes/oslo.service/wallaby.html
+release-notes:
+  https://docs.openstack.org/releasenotes/oslo.service/wallaby.html
diff --git a/deliverables/wallaby/oslo.upgradecheck.yaml b/deliverables/wallaby/oslo.upgradecheck.yaml
index 050e151ca2..3e73f4a2a7 100644
--- a/deliverables/wallaby/oslo.upgradecheck.yaml
+++ b/deliverables/wallaby/oslo.upgradecheck.yaml
@@ -27,6 +27,10 @@ releases:
     projects:
       - repo: openstack/oslo.upgradecheck
         hash: 9561ecb1627059c7131545b24c2f45fbb59daa2c
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/oslo.upgradecheck
+        hash: d3895b0e18539c393329452ef578007a2e1a14d4
 branches:
   - name: stable/wallaby
     location: 1.3.0
diff --git a/deliverables/wallaby/oslo.utils.yaml b/deliverables/wallaby/oslo.utils.yaml
index 5e6e8be4ac..0b2451aa20 100644
--- a/deliverables/wallaby/oslo.utils.yaml
+++ b/deliverables/wallaby/oslo.utils.yaml
@@ -31,9 +31,14 @@ releases:
     projects:
       - repo: openstack/oslo.utils
         hash: fe0d22524021c86ba82c156cc08b1a1890effc60
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/oslo.utils
+        hash: f4ec29f67247a155875b1b594bdd963f2d571166
 branches:
   - name: stable/wallaby
     location: 4.8.0
   - name: unmaintained/wallaby
     location: wallaby-eom
-release-notes: https://docs.openstack.org/releasenotes/oslo.utils/wallaby.html
+release-notes:
+  https://docs.openstack.org/releasenotes/oslo.utils/wallaby.html
diff --git a/deliverables/wallaby/oslo.versionedobjects.yaml b/deliverables/wallaby/oslo.versionedobjects.yaml
index 802af476eb..a1866e4cc7 100644
--- a/deliverables/wallaby/oslo.versionedobjects.yaml
+++ b/deliverables/wallaby/oslo.versionedobjects.yaml
@@ -23,6 +23,10 @@ releases:
     projects:
       - repo: openstack/oslo.versionedobjects
         hash: 89ff171188cdc49dcc7fe651fc82c05b00484b4f
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/oslo.versionedobjects
+        hash: 10788c7e1bd2c47f952082652afed1f1465cad9e
 branches:
   - name: stable/wallaby
     location: 2.4.0
diff --git a/deliverables/wallaby/oslo.vmware.yaml b/deliverables/wallaby/oslo.vmware.yaml
index 41c654164d..ecd916bdf1 100644
--- a/deliverables/wallaby/oslo.vmware.yaml
+++ b/deliverables/wallaby/oslo.vmware.yaml
@@ -27,9 +27,14 @@ releases:
     projects:
       - repo: openstack/oslo.vmware
         hash: dc1a4668581ecb2724ecac007ff5baf6d47bc432
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/oslo.vmware
+        hash: f220af95855778c3b5ea25a56181794ddb221a23
 branches:
   - name: stable/wallaby
     location: 3.8.0
   - name: unmaintained/wallaby
     location: wallaby-eom
-release-notes: https://docs.openstack.org/releasenotes/oslo.vmware/wallaby.html
+release-notes:
+  https://docs.openstack.org/releasenotes/oslo.vmware/wallaby.html
diff --git a/deliverables/wallaby/ovsdbapp.yaml b/deliverables/wallaby/ovsdbapp.yaml
index ed4903fdf4..79bb334a57 100644
--- a/deliverables/wallaby/ovsdbapp.yaml
+++ b/deliverables/wallaby/ovsdbapp.yaml
@@ -42,6 +42,10 @@ releases:
     projects:
       - repo: openstack/ovsdbapp
         hash: 65d02f06d2318c20ee01ba760bbb74f6eafabebf
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/ovsdbapp
+        hash: 231f0f8ae56ae3e753a88b7d772e13a2226f8c5d
 branches:
   - name: stable/wallaby
     location: 1.9.0
diff --git a/deliverables/wallaby/placement.yaml b/deliverables/wallaby/placement.yaml
index 5e0e0566c0..a403651041 100644
--- a/deliverables/wallaby/placement.yaml
+++ b/deliverables/wallaby/placement.yaml
@@ -29,9 +29,14 @@ releases:
     projects:
       - repo: openstack/placement
         hash: 56d0f5b261a29599909ac578d8b09cb1a075fdb6
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/placement
+        hash: 2d930759274d4cad7a900da7029887f50707658a
 branches:
   - name: stable/wallaby
     location: 5.0.0.0rc1
   - name: unmaintained/wallaby
     location: wallaby-eom
-release-notes: https://docs.openstack.org/releasenotes/placement/wallaby.html
+release-notes:
+  https://docs.openstack.org/releasenotes/placement/wallaby.html
diff --git a/deliverables/wallaby/python-barbicanclient.yaml b/deliverables/wallaby/python-barbicanclient.yaml
index 53ccd43f7b..6922caf601 100644
--- a/deliverables/wallaby/python-barbicanclient.yaml
+++ b/deliverables/wallaby/python-barbicanclient.yaml
@@ -18,6 +18,10 @@ releases:
     projects:
       - repo: openstack/python-barbicanclient
         hash: 99eee7a983a5e4528164812cef51fc7715ef2177
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/python-barbicanclient
+        hash: f09f4a19431bf51d92d097231bf5238125bef2c6
 branches:
   - name: stable/wallaby
     location: 5.1.0
diff --git a/deliverables/wallaby/python-cinderclient.yaml b/deliverables/wallaby/python-cinderclient.yaml
index d6103099c9..12a46a4f75 100644
--- a/deliverables/wallaby/python-cinderclient.yaml
+++ b/deliverables/wallaby/python-cinderclient.yaml
@@ -27,6 +27,10 @@ releases:
     projects:
       - repo: openstack/python-cinderclient
         hash: 3d309b785ad7a58fb13176d1a9b9770afb36c238
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/python-cinderclient
+        hash: 52e8cb1af3f9123055ac420058913512e1720a1c
 branches:
   - name: stable/wallaby
     location: 7.4.0
diff --git a/deliverables/wallaby/python-glanceclient.yaml b/deliverables/wallaby/python-glanceclient.yaml
index 9a35c4831a..8b515e8203 100644
--- a/deliverables/wallaby/python-glanceclient.yaml
+++ b/deliverables/wallaby/python-glanceclient.yaml
@@ -19,6 +19,10 @@ releases:
     projects:
       - repo: openstack/python-glanceclient
         hash: cfed22fcf19a97ddcfc0b0ffdb28e2b0f02d5ea3
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/python-glanceclient
+        hash: cfed22fcf19a97ddcfc0b0ffdb28e2b0f02d5ea3
 branches:
   - name: stable/wallaby
     location: 3.3.0
diff --git a/deliverables/wallaby/python-heatclient.yaml b/deliverables/wallaby/python-heatclient.yaml
index b75b51aaca..0db49c0f12 100644
--- a/deliverables/wallaby/python-heatclient.yaml
+++ b/deliverables/wallaby/python-heatclient.yaml
@@ -23,6 +23,10 @@ releases:
     projects:
       - repo: openstack/python-heatclient
         hash: d16c245f5defdf811de8fe8615fa06ae6daae5b5
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/python-heatclient
+        hash: d16c245f5defdf811de8fe8615fa06ae6daae5b5
 branches:
   - name: stable/wallaby
     location: 2.3.0
diff --git a/deliverables/wallaby/python-keystoneclient.yaml b/deliverables/wallaby/python-keystoneclient.yaml
index 79049eb54d..fb65f0d0c0 100644
--- a/deliverables/wallaby/python-keystoneclient.yaml
+++ b/deliverables/wallaby/python-keystoneclient.yaml
@@ -19,6 +19,10 @@ releases:
     projects:
       - repo: openstack/python-keystoneclient
         hash: 3fe898ba4d170c2131cf857045d70e24ab376471
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/python-keystoneclient
+        hash: 3fe898ba4d170c2131cf857045d70e24ab376471
 branches:
   - name: stable/wallaby
     location: 4.2.0
diff --git a/deliverables/wallaby/python-neutronclient.yaml b/deliverables/wallaby/python-neutronclient.yaml
index 7f369ee18e..91fe056cf1 100644
--- a/deliverables/wallaby/python-neutronclient.yaml
+++ b/deliverables/wallaby/python-neutronclient.yaml
@@ -23,6 +23,10 @@ releases:
     projects:
       - repo: openstack/python-neutronclient
         hash: 29a9f5ef3908b5c7e45dbd010446c335a00e9ed4
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/python-neutronclient
+        hash: 9746870c39a3207e17bbf75cf03e69f874ca5648
 branches:
   - name: stable/wallaby
     location: 7.3.0
diff --git a/deliverables/wallaby/python-novaclient.yaml b/deliverables/wallaby/python-novaclient.yaml
index 6f3b87889d..2373f15d0a 100644
--- a/deliverables/wallaby/python-novaclient.yaml
+++ b/deliverables/wallaby/python-novaclient.yaml
@@ -27,6 +27,10 @@ releases:
     projects:
       - repo: openstack/python-novaclient
         hash: 5ee44275f64fe43aa4917301a9af63d81c0db9ee
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/python-novaclient
+        hash: 5ee44275f64fe43aa4917301a9af63d81c0db9ee
 branches:
   - name: stable/wallaby
     location: 17.4.0
diff --git a/deliverables/wallaby/python-swiftclient.yaml b/deliverables/wallaby/python-swiftclient.yaml
index 9f57062ba9..c0c283d81f 100644
--- a/deliverables/wallaby/python-swiftclient.yaml
+++ b/deliverables/wallaby/python-swiftclient.yaml
@@ -23,6 +23,10 @@ releases:
     projects:
       - repo: openstack/python-swiftclient
         hash: c3e3c2b0a784cd384257185e43117a4dcceeb1ff
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/python-swiftclient
+        hash: c3e3c2b0a784cd384257185e43117a4dcceeb1ff
 branches:
   - name: stable/wallaby
     location: 3.11.1
diff --git a/deliverables/wallaby/requirements.yaml b/deliverables/wallaby/requirements.yaml
index f9b1756aec..8d6c330aa8 100644
--- a/deliverables/wallaby/requirements.yaml
+++ b/deliverables/wallaby/requirements.yaml
@@ -10,7 +10,8 @@ repository-settings:
 branches:
   - name: stable/wallaby
     location:
-      openstack/requirements: 040e24a73f93c5f1c81fc2312a3552f4cb972cc5
+      openstack/requirements:
+        040e24a73f93c5f1c81fc2312a3552f4cb972cc5
   - name: unmaintained/wallaby
     location: wallaby-eom
 releases:
@@ -18,3 +19,7 @@ releases:
     projects:
       - repo: openstack/requirements
         hash: 015717ea1bcc3aa5060bf2257f8438d7b8655621
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/requirements
+        hash: 7e8c973dce0b460d62c7c4a5041cacace670d99e
diff --git a/deliverables/wallaby/stevedore.yaml b/deliverables/wallaby/stevedore.yaml
index 996b8766e3..ff5be40a19 100644
--- a/deliverables/wallaby/stevedore.yaml
+++ b/deliverables/wallaby/stevedore.yaml
@@ -31,9 +31,14 @@ releases:
     projects:
       - repo: openstack/stevedore
         hash: 7b48fffd01307223b53ef129bb6a0753a67abdce
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/stevedore
+        hash: 7068a5e025050610aa7955dd63968348b2062670
 branches:
   - name: stable/wallaby
     location: 3.3.0
   - name: unmaintained/wallaby
     location: wallaby-eom
-release-notes: https://docs.openstack.org/releasenotes/stevedore/wallaby.html
+release-notes:
+  https://docs.openstack.org/releasenotes/stevedore/wallaby.html
diff --git a/deliverables/wallaby/storlets.yaml b/deliverables/wallaby/storlets.yaml
index 7de274ab31..c5657a062d 100644
--- a/deliverables/wallaby/storlets.yaml
+++ b/deliverables/wallaby/storlets.yaml
@@ -23,9 +23,14 @@ releases:
     projects:
       - repo: openstack/storlets
         hash: d6edad01309e06baadd84fa7af9fa5d7e0fc05e2
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/storlets
+        hash: d6edad01309e06baadd84fa7af9fa5d7e0fc05e2
 branches:
   - name: stable/wallaby
     location: 7.0.0.0rc1
   - name: unmaintained/wallaby
     location: wallaby-eom
-release-notes: https://docs.openstack.org/releasenotes/storlets/wallaby.html
+release-notes:
+  https://docs.openstack.org/releasenotes/storlets/wallaby.html
diff --git a/deliverables/wallaby/swift.yaml b/deliverables/wallaby/swift.yaml
index 2efbeae09a..8a55c669a3 100644
--- a/deliverables/wallaby/swift.yaml
+++ b/deliverables/wallaby/swift.yaml
@@ -18,17 +18,23 @@ releases:
     projects:
       - repo: openstack/swift
         hash: 16dbcae9df9773f2b2bfea41fd4156e16aa14b37
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/swift
+        hash: 69da1ab55a3be2f4f22a653397e0c8c145e040c5
 branches:
   - name: stable/wallaby
     location: 2.27.0
   - name: unmaintained/wallaby
     location: wallaby-eom
 cycle-highlights:
-  - Static large object segments can now be deleted asynchronously;
-    multipart uploads deleted through the S3 API will always be deleted
-    asynchronously.
-  - Numerous sharding improvements, including the ability to cache shard
-    ranges for listings and support for operator-driven shrinking.
-  - Several part-power-increase improvements, which ensure small clusters
-    are capabale of growing to be large clusters.
-release-notes: https://docs.openstack.org/releasenotes/swift/wallaby.html
+  - Static large object segments can now be deleted
+    asynchronously; multipart uploads deleted through the S3 API
+    will always be deleted asynchronously.
+  - Numerous sharding improvements, including the ability to cache
+    shard ranges for listings and support for operator-driven
+    shrinking.
+  - Several part-power-increase improvements, which ensure small
+    clusters are capabale of growing to be large clusters.
+release-notes:
+  https://docs.openstack.org/releasenotes/swift/wallaby.html
diff --git a/deliverables/wallaby/tooz.yaml b/deliverables/wallaby/tooz.yaml
index eecd9213a0..54dc43533c 100644
--- a/deliverables/wallaby/tooz.yaml
+++ b/deliverables/wallaby/tooz.yaml
@@ -31,9 +31,14 @@ releases:
     projects:
       - repo: openstack/tooz
         hash: 8611c15308925621260f573c0f275a1dea9f80e0
+  - version: wallaby-eol
+    projects:
+      - repo: openstack/tooz
+        hash: 0689f00089677b2a4c4d94f6f9dac7ee2acc904b
 branches:
   - name: stable/wallaby
     location: 2.8.0
   - name: unmaintained/wallaby
     location: wallaby-eom
-release-notes: https://docs.openstack.org/releasenotes/tooz/wallaby.html
+release-notes:
+  https://docs.openstack.org/releasenotes/tooz/wallaby.html