diff --git a/deliverables/ussuri/puppet-aodh.yaml b/deliverables/ussuri/puppet-aodh.yaml
index e9e1f8f017..e7baf11f2a 100644
--- a/deliverables/ussuri/puppet-aodh.yaml
+++ b/deliverables/ussuri/puppet-aodh.yaml
@@ -34,6 +34,10 @@ releases:
     projects:
       - repo: openstack/puppet-aodh
         hash: cf41329c346358f75f12319ad832533427afdab5
+  - version: ussuri-eol
+    projects:
+      - repo: openstack/puppet-aodh
+        hash: cf41329c346358f75f12319ad832533427afdab5
 branches:
   - name: stable/ussuri
     location: 16.3.0
diff --git a/deliverables/ussuri/puppet-barbican.yaml b/deliverables/ussuri/puppet-barbican.yaml
index 64b34ac093..ff29a85641 100644
--- a/deliverables/ussuri/puppet-barbican.yaml
+++ b/deliverables/ussuri/puppet-barbican.yaml
@@ -34,6 +34,10 @@ releases:
     projects:
       - repo: openstack/puppet-barbican
         hash: d7b35fe443e7388892315fcf3fc5069e1797fd08
+  - version: ussuri-eol
+    projects:
+      - repo: openstack/puppet-barbican
+        hash: d7b35fe443e7388892315fcf3fc5069e1797fd08
 branches:
   - name: stable/ussuri
     location: 16.3.0
diff --git a/deliverables/ussuri/puppet-ceilometer.yaml b/deliverables/ussuri/puppet-ceilometer.yaml
index 5f2b5ff136..b7d9639026 100644
--- a/deliverables/ussuri/puppet-ceilometer.yaml
+++ b/deliverables/ussuri/puppet-ceilometer.yaml
@@ -34,6 +34,10 @@ releases:
     projects:
       - repo: openstack/puppet-ceilometer
         hash: f4d6c1455a991f8013607ba753adf5bd33c64ebd
+  - version: ussuri-eol
+    projects:
+      - repo: openstack/puppet-ceilometer
+        hash: f4d6c1455a991f8013607ba753adf5bd33c64ebd
 branches:
   - name: stable/ussuri
     location: 16.3.0
diff --git a/deliverables/ussuri/puppet-cinder.yaml b/deliverables/ussuri/puppet-cinder.yaml
index 6609d0faa1..08d32e48ef 100644
--- a/deliverables/ussuri/puppet-cinder.yaml
+++ b/deliverables/ussuri/puppet-cinder.yaml
@@ -34,6 +34,10 @@ releases:
     projects:
       - repo: openstack/puppet-cinder
         hash: f77ace6d66169890eb3b0091945aee8f37cc4167
+  - version: ussuri-eol
+    projects:
+      - repo: openstack/puppet-cinder
+        hash: fd56f66f2580de301af89e874cc7b86a2ce179aa
 branches:
   - name: stable/ussuri
     location: 16.3.0
diff --git a/deliverables/ussuri/puppet-cloudkitty.yaml b/deliverables/ussuri/puppet-cloudkitty.yaml
index bae6a14bb2..9c4d0f4bb1 100644
--- a/deliverables/ussuri/puppet-cloudkitty.yaml
+++ b/deliverables/ussuri/puppet-cloudkitty.yaml
@@ -34,6 +34,10 @@ releases:
     projects:
       - repo: openstack/puppet-cloudkitty
         hash: 59841b77085133524464f1bf3a12fe1bdd84da06
+  - version: ussuri-eol
+    projects:
+      - repo: openstack/puppet-cloudkitty
+        hash: 59841b77085133524464f1bf3a12fe1bdd84da06
 branches:
   - name: stable/ussuri
     location: 5.3.0
diff --git a/deliverables/ussuri/puppet-congress.yaml b/deliverables/ussuri/puppet-congress.yaml
index 872306a89d..4b9f2f372b 100644
--- a/deliverables/ussuri/puppet-congress.yaml
+++ b/deliverables/ussuri/puppet-congress.yaml
@@ -32,6 +32,10 @@ releases:
     projects:
       - repo: openstack/puppet-congress
         hash: 6f2fc35212ea1bd76c6d1657b73fdf956de35552
+  - version: ussuri-eol
+    projects:
+      - repo: openstack/puppet-congress
+        hash: df0adca61ed35e0496c487f6a2d622bf35f4f6c7
 branches:
   - name: stable/ussuri
     location: 16.3.0
diff --git a/deliverables/ussuri/puppet-designate.yaml b/deliverables/ussuri/puppet-designate.yaml
index aa8b3fb05a..c1148d65db 100644
--- a/deliverables/ussuri/puppet-designate.yaml
+++ b/deliverables/ussuri/puppet-designate.yaml
@@ -34,6 +34,10 @@ releases:
     projects:
       - repo: openstack/puppet-designate
         hash: 94758c0b2ee281f305eddf6c47dffc29a92a93fe
+  - version: ussuri-eol
+    projects:
+      - repo: openstack/puppet-designate
+        hash: 94758c0b2ee281f305eddf6c47dffc29a92a93fe
 branches:
   - name: stable/ussuri
     location: 16.3.0
diff --git a/deliverables/ussuri/puppet-ec2api.yaml b/deliverables/ussuri/puppet-ec2api.yaml
index d0b6fc2a13..9b8731c719 100644
--- a/deliverables/ussuri/puppet-ec2api.yaml
+++ b/deliverables/ussuri/puppet-ec2api.yaml
@@ -34,6 +34,10 @@ releases:
     projects:
       - repo: openstack/puppet-ec2api
         hash: 92e0775247e445c5512f2e6326f208288930457d
+  - version: ussuri-eol
+    projects:
+      - repo: openstack/puppet-ec2api
+        hash: 92e0775247e445c5512f2e6326f208288930457d
 branches:
   - name: stable/ussuri
     location: 16.3.0
diff --git a/deliverables/ussuri/puppet-freezer.yaml b/deliverables/ussuri/puppet-freezer.yaml
index 25f676501a..5a559b8972 100644
--- a/deliverables/ussuri/puppet-freezer.yaml
+++ b/deliverables/ussuri/puppet-freezer.yaml
@@ -32,6 +32,10 @@ releases:
     projects:
       - repo: openstack/puppet-freezer
         hash: b3b4c328294dc1c07238658f05ba37b9af4b7598
+  - version: ussuri-eol
+    projects:
+      - repo: openstack/puppet-freezer
+        hash: c5d291786e60eb5c45ba7fae446180958ee47c0e
 branches:
   - name: stable/ussuri
     location: 5.3.0
diff --git a/deliverables/ussuri/puppet-glance.yaml b/deliverables/ussuri/puppet-glance.yaml
index 98241e7049..60a89898ad 100644
--- a/deliverables/ussuri/puppet-glance.yaml
+++ b/deliverables/ussuri/puppet-glance.yaml
@@ -38,6 +38,10 @@ releases:
     projects:
       - repo: openstack/puppet-glance
         hash: 55dbae7a49e0b007d803ea3a4fd64ee7483f8a16
+  - version: ussuri-eol
+    projects:
+      - repo: openstack/puppet-glance
+        hash: b3964a75ba9fb1ede8725c3146ca052ed589b940
 branches:
   - name: stable/ussuri
     location: 16.3.0
diff --git a/deliverables/ussuri/puppet-glare.yaml b/deliverables/ussuri/puppet-glare.yaml
index 9a3bb0c78e..0e347ad10e 100644
--- a/deliverables/ussuri/puppet-glare.yaml
+++ b/deliverables/ussuri/puppet-glare.yaml
@@ -32,6 +32,10 @@ releases:
     projects:
       - repo: openstack/puppet-glare
         hash: 7501bc5252ae34915084e72de26d98899cf11ff3
+  - version: ussuri-eol
+    projects:
+      - repo: openstack/puppet-glare
+        hash: 083026ac23e8368ec95fe6678f8aa1056f2e47e9
 branches:
   - name: stable/ussuri
     location: 5.3.0
diff --git a/deliverables/ussuri/puppet-gnocchi.yaml b/deliverables/ussuri/puppet-gnocchi.yaml
index 28e5e44fbf..11d53b2f00 100644
--- a/deliverables/ussuri/puppet-gnocchi.yaml
+++ b/deliverables/ussuri/puppet-gnocchi.yaml
@@ -34,6 +34,10 @@ releases:
     projects:
       - repo: openstack/puppet-gnocchi
         hash: 11859d474725f1d06dbeeb99bedcbdfe33775473
+  - version: ussuri-eol
+    projects:
+      - repo: openstack/puppet-gnocchi
+        hash: 11859d474725f1d06dbeeb99bedcbdfe33775473
 branches:
   - name: stable/ussuri
     location: 16.3.0
diff --git a/deliverables/ussuri/puppet-heat.yaml b/deliverables/ussuri/puppet-heat.yaml
index 296e2b8b18..a430f5e5a8 100644
--- a/deliverables/ussuri/puppet-heat.yaml
+++ b/deliverables/ussuri/puppet-heat.yaml
@@ -34,6 +34,10 @@ releases:
     projects:
       - repo: openstack/puppet-heat
         hash: d267572494f2eaac67553f2ed6471b155c4534b4
+  - version: ussuri-eol
+    projects:
+      - repo: openstack/puppet-heat
+        hash: 5fed3d85fe0928d93f88c3ef1d5016968e667555
 branches:
   - name: stable/ussuri
     location: 16.3.0
diff --git a/deliverables/ussuri/puppet-horizon.yaml b/deliverables/ussuri/puppet-horizon.yaml
index ee730979f8..96400e9b97 100644
--- a/deliverables/ussuri/puppet-horizon.yaml
+++ b/deliverables/ussuri/puppet-horizon.yaml
@@ -34,6 +34,10 @@ releases:
     projects:
       - repo: openstack/puppet-horizon
         hash: 5c87c935880954d368b851a40786b97ec109811d
+  - version: ussuri-eol
+    projects:
+      - repo: openstack/puppet-horizon
+        hash: d2a428f9b6a2782d0b3a8320a4cccd2c871dd9fe
 branches:
   - name: stable/ussuri
     location: 16.3.0
diff --git a/deliverables/ussuri/puppet-ironic.yaml b/deliverables/ussuri/puppet-ironic.yaml
index edbe573720..f13b9c5a93 100644
--- a/deliverables/ussuri/puppet-ironic.yaml
+++ b/deliverables/ussuri/puppet-ironic.yaml
@@ -38,6 +38,10 @@ releases:
     projects:
       - repo: openstack/puppet-ironic
         hash: 0e1cfd2ea256b3127b5f60beccc9196b33a5b12a
+  - version: ussuri-eol
+    projects:
+      - repo: openstack/puppet-ironic
+        hash: 80b61b19cb381992414d9681603c997959c4b43f
 branches:
   - name: stable/ussuri
     location: 16.3.0
diff --git a/deliverables/ussuri/puppet-keystone.yaml b/deliverables/ussuri/puppet-keystone.yaml
index 7ba97d5b22..79584fef42 100644
--- a/deliverables/ussuri/puppet-keystone.yaml
+++ b/deliverables/ussuri/puppet-keystone.yaml
@@ -34,6 +34,10 @@ releases:
     projects:
       - repo: openstack/puppet-keystone
         hash: 0c5c44650f16e8611b76af450bc8ae3c6f06a2e4
+  - version: ussuri-eol
+    projects:
+      - repo: openstack/puppet-keystone
+        hash: d7d6adfd5b2148cc5b3dff3fb188b6619f0f1084
 branches:
   - name: stable/ussuri
     location: 16.3.0
diff --git a/deliverables/ussuri/puppet-magnum.yaml b/deliverables/ussuri/puppet-magnum.yaml
index c1b3b6c9f1..c71c58b84a 100644
--- a/deliverables/ussuri/puppet-magnum.yaml
+++ b/deliverables/ussuri/puppet-magnum.yaml
@@ -34,6 +34,10 @@ releases:
     projects:
       - repo: openstack/puppet-magnum
         hash: 7fef0c85202767d26af282aed17d6d1eca873cba
+  - version: ussuri-eol
+    projects:
+      - repo: openstack/puppet-magnum
+        hash: 7fef0c85202767d26af282aed17d6d1eca873cba
 branches:
   - name: stable/ussuri
     location: 16.3.0
diff --git a/deliverables/ussuri/puppet-manila.yaml b/deliverables/ussuri/puppet-manila.yaml
index 0c5cb0efdd..a0e1d1249e 100644
--- a/deliverables/ussuri/puppet-manila.yaml
+++ b/deliverables/ussuri/puppet-manila.yaml
@@ -34,6 +34,10 @@ releases:
     projects:
       - repo: openstack/puppet-manila
         hash: 059744c52c2e755164317c926316565f8ff7eee8
+  - version: ussuri-eol
+    projects:
+      - repo: openstack/puppet-manila
+        hash: d83294f2849383eba1e4d98b0b32000edc53523d
 branches:
   - name: stable/ussuri
     location: 16.3.0
diff --git a/deliverables/ussuri/puppet-mistral.yaml b/deliverables/ussuri/puppet-mistral.yaml
index ef7bae5847..94f6fb0302 100644
--- a/deliverables/ussuri/puppet-mistral.yaml
+++ b/deliverables/ussuri/puppet-mistral.yaml
@@ -34,6 +34,10 @@ releases:
     projects:
       - repo: openstack/puppet-mistral
         hash: 5ef5a4a20c0d59b058abb159b1911d514a544b75
+  - version: ussuri-eol
+    projects:
+      - repo: openstack/puppet-mistral
+        hash: 7ea82576cda761a97ccbfa906705841333ddfbb1
 branches:
   - name: stable/ussuri
     location: 16.3.0
diff --git a/deliverables/ussuri/puppet-monasca.yaml b/deliverables/ussuri/puppet-monasca.yaml
index 5200b41923..42968bac9f 100644
--- a/deliverables/ussuri/puppet-monasca.yaml
+++ b/deliverables/ussuri/puppet-monasca.yaml
@@ -32,6 +32,10 @@ releases:
     projects:
       - repo: openstack/puppet-monasca
         hash: 09296701c0a881a4485f6635fb58c8720fa4d5db
+  - version: ussuri-eol
+    projects:
+      - repo: openstack/puppet-monasca
+        hash: c62681b5e156d3c3e64892ff2a232216df8cd344
 branches:
   - name: stable/ussuri
     location: 5.3.0
diff --git a/deliverables/ussuri/puppet-murano.yaml b/deliverables/ussuri/puppet-murano.yaml
index cf1525cfc0..27b6927971 100644
--- a/deliverables/ussuri/puppet-murano.yaml
+++ b/deliverables/ussuri/puppet-murano.yaml
@@ -34,6 +34,10 @@ releases:
     projects:
       - repo: openstack/puppet-murano
         hash: aa0cf34aa507aeecba7bbc1e9939b3e7edfb0d71
+  - version: ussuri-eol
+    projects:
+      - repo: openstack/puppet-murano
+        hash: 6a3238d8d72ef0fa9c5b7b8fa53deaa50d99b8a8
 branches:
   - name: stable/ussuri
     location: 16.3.0
diff --git a/deliverables/ussuri/puppet-neutron.yaml b/deliverables/ussuri/puppet-neutron.yaml
index 4544235527..a4ee8bab91 100644
--- a/deliverables/ussuri/puppet-neutron.yaml
+++ b/deliverables/ussuri/puppet-neutron.yaml
@@ -38,6 +38,10 @@ releases:
     projects:
       - repo: openstack/puppet-neutron
         hash: 038626a8e03cf19c95189a4d28335baf23fbbe11
+  - version: ussuri-eol
+    projects:
+      - repo: openstack/puppet-neutron
+        hash: 1654bbe1784078cc09af8c2accae2b39ae80b0e5
 branches:
   - name: stable/ussuri
     location: 16.3.0
diff --git a/deliverables/ussuri/puppet-nova.yaml b/deliverables/ussuri/puppet-nova.yaml
index 0e655cb4b1..7b9dc189ec 100644
--- a/deliverables/ussuri/puppet-nova.yaml
+++ b/deliverables/ussuri/puppet-nova.yaml
@@ -42,6 +42,10 @@ releases:
     projects:
       - repo: openstack/puppet-nova
         hash: a69f5bf4becedf6ce1df02a31ac9c87805f639a3
+  - version: ussuri-eol
+    projects:
+      - repo: openstack/puppet-nova
+        hash: a1116af584e13612c0deb9e9100c59152bc025fd
 branches:
   - name: stable/ussuri
     location: 16.3.0
diff --git a/deliverables/ussuri/puppet-octavia.yaml b/deliverables/ussuri/puppet-octavia.yaml
index 8206238464..76aa9608e9 100644
--- a/deliverables/ussuri/puppet-octavia.yaml
+++ b/deliverables/ussuri/puppet-octavia.yaml
@@ -34,6 +34,10 @@ releases:
     projects:
       - repo: openstack/puppet-octavia
         hash: 3f3f8a82b63269dd1f4369fcfe757fa9da77f839
+  - version: ussuri-eol
+    projects:
+      - repo: openstack/puppet-octavia
+        hash: 52771825e27bd2d90de66b5e714a488e71d4327e
 branches:
   - name: stable/ussuri
     location: 16.3.0
diff --git a/deliverables/ussuri/puppet-openstack-integration.yaml b/deliverables/ussuri/puppet-openstack-integration.yaml
index 92bc5345fd..970712458c 100644
--- a/deliverables/ussuri/puppet-openstack-integration.yaml
+++ b/deliverables/ussuri/puppet-openstack-integration.yaml
@@ -6,6 +6,11 @@ type: other
 stable-branch-type: tagless
 repository-settings:
   openstack/puppet-openstack-integration: {}
+releases:
+  - version: ussuri-eol
+    projects:
+      - repo: openstack/puppet-openstack-integration
+        hash: d42cc96b8951e1b124e8d9122ee98a303dcc7e40
 branches:
   - name: stable/ussuri
     location:
diff --git a/deliverables/ussuri/puppet-openstack_extras.yaml b/deliverables/ussuri/puppet-openstack_extras.yaml
index c828997845..d75c80d4f1 100644
--- a/deliverables/ussuri/puppet-openstack_extras.yaml
+++ b/deliverables/ussuri/puppet-openstack_extras.yaml
@@ -34,6 +34,10 @@ releases:
     projects:
       - repo: openstack/puppet-openstack_extras
         hash: 5a2807faa638caf5d2884e61fe62bf9ba9b89b8b
+  - version: ussuri-eol
+    projects:
+      - repo: openstack/puppet-openstack_extras
+        hash: 1744edb487307ebc46789187df1397f8e846d0b3
 branches:
   - name: stable/ussuri
     location: 16.3.0
diff --git a/deliverables/ussuri/puppet-openstack_spec_helper.yaml b/deliverables/ussuri/puppet-openstack_spec_helper.yaml
index 1d40883dc6..dbe747c01b 100644
--- a/deliverables/ussuri/puppet-openstack_spec_helper.yaml
+++ b/deliverables/ussuri/puppet-openstack_spec_helper.yaml
@@ -6,6 +6,11 @@ type: other
 stable-branch-type: tagless
 repository-settings:
   openstack/puppet-openstack_spec_helper: {}
+releases:
+  - version: ussuri-eol
+    projects:
+      - repo: openstack/puppet-openstack_spec_helper
+        hash: 6fa861cf0699d09d038c65807770763438019647
 branches:
   - name: stable/ussuri
     location:
diff --git a/deliverables/ussuri/puppet-openstacklib.yaml b/deliverables/ussuri/puppet-openstacklib.yaml
index cd3de2fb10..227dd5c123 100644
--- a/deliverables/ussuri/puppet-openstacklib.yaml
+++ b/deliverables/ussuri/puppet-openstacklib.yaml
@@ -34,6 +34,10 @@ releases:
     projects:
       - repo: openstack/puppet-openstacklib
         hash: f0934867c619e33599365b49388c0bc6a30d5559
+  - version: ussuri-eol
+    projects:
+      - repo: openstack/puppet-openstacklib
+        hash: 63e359e77cafec92fb3cca9d2b68eb553b7f50c4
 branches:
   - name: stable/ussuri
     location: 16.3.0
diff --git a/deliverables/ussuri/puppet-oslo.yaml b/deliverables/ussuri/puppet-oslo.yaml
index 3c12ee905f..6e744c2769 100644
--- a/deliverables/ussuri/puppet-oslo.yaml
+++ b/deliverables/ussuri/puppet-oslo.yaml
@@ -34,6 +34,10 @@ releases:
     projects:
       - repo: openstack/puppet-oslo
         hash: bcab43d802e651ffe046a417a21ee80b95743ff5
+  - version: ussuri-eol
+    projects:
+      - repo: openstack/puppet-oslo
+        hash: 33d36b597b5b30ee11990d3f255ddc81529da3c8
 branches:
   - name: stable/ussuri
     location: 16.3.0
diff --git a/deliverables/ussuri/puppet-ovn.yaml b/deliverables/ussuri/puppet-ovn.yaml
index 4162fa00de..bc5f34ac7a 100644
--- a/deliverables/ussuri/puppet-ovn.yaml
+++ b/deliverables/ussuri/puppet-ovn.yaml
@@ -38,6 +38,10 @@ releases:
     projects:
       - repo: openstack/puppet-ovn
         hash: 3a8dde1a0f957c144b74631d46535eb7303e2406
+  - version: ussuri-eol
+    projects:
+      - repo: openstack/puppet-ovn
+        hash: ad539dd0f851e47c528d77758afc2f69bfa66d95
 branches:
   - name: stable/ussuri
     location: 16.3.0
diff --git a/deliverables/ussuri/puppet-panko.yaml b/deliverables/ussuri/puppet-panko.yaml
index 0134fe779a..f78d45ea22 100644
--- a/deliverables/ussuri/puppet-panko.yaml
+++ b/deliverables/ussuri/puppet-panko.yaml
@@ -36,6 +36,10 @@ releases:
     projects:
       - repo: openstack/puppet-panko
         hash: 346851f56dc9feaa5ffe376cbc2a6a78a9bb137b
+  - version: ussuri-eol
+    projects:
+      - repo: openstack/puppet-panko
+        hash: 346851f56dc9feaa5ffe376cbc2a6a78a9bb137b
 branches:
   - name: stable/ussuri
     location: 16.3.0
diff --git a/deliverables/ussuri/puppet-placement.yaml b/deliverables/ussuri/puppet-placement.yaml
index cfee0f6a77..25a1525aad 100644
--- a/deliverables/ussuri/puppet-placement.yaml
+++ b/deliverables/ussuri/puppet-placement.yaml
@@ -34,6 +34,10 @@ releases:
     projects:
       - repo: openstack/puppet-placement
         hash: e70030f51aed066d08df63a7e7c8eea116870784
+  - version: ussuri-eol
+    projects:
+      - repo: openstack/puppet-placement
+        hash: e70030f51aed066d08df63a7e7c8eea116870784
 branches:
   - name: stable/ussuri
     location: 3.3.0
diff --git a/deliverables/ussuri/puppet-qdr.yaml b/deliverables/ussuri/puppet-qdr.yaml
index 268843d6bc..0fae92bfe8 100644
--- a/deliverables/ussuri/puppet-qdr.yaml
+++ b/deliverables/ussuri/puppet-qdr.yaml
@@ -34,6 +34,10 @@ releases:
     projects:
       - repo: openstack/puppet-qdr
         hash: a49a924bcfce320570c65de900b2cc23a5aa8c4b
+  - version: ussuri-eol
+    projects:
+      - repo: openstack/puppet-qdr
+        hash: a49a924bcfce320570c65de900b2cc23a5aa8c4b
 branches:
   - name: stable/ussuri
     location: 5.3.0
diff --git a/deliverables/ussuri/puppet-rally.yaml b/deliverables/ussuri/puppet-rally.yaml
index adda855196..f14367a638 100644
--- a/deliverables/ussuri/puppet-rally.yaml
+++ b/deliverables/ussuri/puppet-rally.yaml
@@ -36,6 +36,10 @@ releases:
     projects:
       - repo: openstack/puppet-rally
         hash: 03539c61e0dd9ec7e4341339d6f56df3aa17ca16
+  - version: ussuri-eol
+    projects:
+      - repo: openstack/puppet-rally
+        hash: 03539c61e0dd9ec7e4341339d6f56df3aa17ca16
 branches:
   - name: stable/ussuri
     location: 4.3.0
diff --git a/deliverables/ussuri/puppet-sahara.yaml b/deliverables/ussuri/puppet-sahara.yaml
index 259743b747..1188e8c596 100644
--- a/deliverables/ussuri/puppet-sahara.yaml
+++ b/deliverables/ussuri/puppet-sahara.yaml
@@ -34,6 +34,10 @@ releases:
     projects:
       - repo: openstack/puppet-sahara
         hash: 3a673ec6b252c517d8dd172817016c8998de823d
+  - version: ussuri-eol
+    projects:
+      - repo: openstack/puppet-sahara
+        hash: 3a673ec6b252c517d8dd172817016c8998de823d
 branches:
   - name: stable/ussuri
     location: 16.3.0
diff --git a/deliverables/ussuri/puppet-senlin.yaml b/deliverables/ussuri/puppet-senlin.yaml
index 26fdf2f6e2..2c5872ee5b 100644
--- a/deliverables/ussuri/puppet-senlin.yaml
+++ b/deliverables/ussuri/puppet-senlin.yaml
@@ -32,6 +32,10 @@ releases:
     projects:
       - repo: openstack/puppet-senlin
         hash: 79ed3a3fe0bd563776db28ddb047728245cce359
+  - version: ussuri-eol
+    projects:
+      - repo: openstack/puppet-senlin
+        hash: dd0aa0ea70d1c68261696f8b6ed6b9d7e041f92e
 branches:
   - name: stable/ussuri
     location: 3.3.0
diff --git a/deliverables/ussuri/puppet-swift.yaml b/deliverables/ussuri/puppet-swift.yaml
index 874dd3ced9..2658957479 100644
--- a/deliverables/ussuri/puppet-swift.yaml
+++ b/deliverables/ussuri/puppet-swift.yaml
@@ -34,6 +34,10 @@ releases:
     projects:
       - repo: openstack/puppet-swift
         hash: e500d0b4ecfddd330105ead1739ce044a92e3a18
+  - version: ussuri-eol
+    projects:
+      - repo: openstack/puppet-swift
+        hash: 4c723fe0b07d74eb9aed1a433fc54b318ea5f249
 branches:
   - name: stable/ussuri
     location: 16.3.0
diff --git a/deliverables/ussuri/puppet-tacker.yaml b/deliverables/ussuri/puppet-tacker.yaml
index b5bad32b0e..3266ae6889 100644
--- a/deliverables/ussuri/puppet-tacker.yaml
+++ b/deliverables/ussuri/puppet-tacker.yaml
@@ -36,6 +36,10 @@ releases:
     projects:
       - repo: openstack/puppet-tacker
         hash: bfaed677653a0eeac50c5c4ed6f65325585b5341
+  - version: ussuri-eol
+    projects:
+      - repo: openstack/puppet-tacker
+        hash: bfaed677653a0eeac50c5c4ed6f65325585b5341
 branches:
   - name: stable/ussuri
     location: 16.3.0
diff --git a/deliverables/ussuri/puppet-tempest.yaml b/deliverables/ussuri/puppet-tempest.yaml
index 9cca1bbbd0..a6c4d61cdf 100644
--- a/deliverables/ussuri/puppet-tempest.yaml
+++ b/deliverables/ussuri/puppet-tempest.yaml
@@ -34,6 +34,10 @@ releases:
     projects:
       - repo: openstack/puppet-tempest
         hash: 83f8b142b8f27ef0a8cbac71b38657df7b3f7019
+  - version: ussuri-eol
+    projects:
+      - repo: openstack/puppet-tempest
+        hash: 83f8b142b8f27ef0a8cbac71b38657df7b3f7019
 branches:
   - name: stable/ussuri
     location: 16.3.0
diff --git a/deliverables/ussuri/puppet-trove.yaml b/deliverables/ussuri/puppet-trove.yaml
index ff3db3d14f..a0638433d3 100644
--- a/deliverables/ussuri/puppet-trove.yaml
+++ b/deliverables/ussuri/puppet-trove.yaml
@@ -34,6 +34,10 @@ releases:
     projects:
       - repo: openstack/puppet-trove
         hash: bc9bccd35af8eb2240faff67c3325a075dc4e085
+  - version: ussuri-eol
+    projects:
+      - repo: openstack/puppet-trove
+        hash: bc9bccd35af8eb2240faff67c3325a075dc4e085
 branches:
   - name: stable/ussuri
     location: 16.3.0
diff --git a/deliverables/ussuri/puppet-vitrage.yaml b/deliverables/ussuri/puppet-vitrage.yaml
index 89f30c9e5f..ef283fdb38 100644
--- a/deliverables/ussuri/puppet-vitrage.yaml
+++ b/deliverables/ussuri/puppet-vitrage.yaml
@@ -34,6 +34,10 @@ releases:
     projects:
       - repo: openstack/puppet-vitrage
         hash: 02298cd18b70fdc5abf1cd5e95839769718f88c3
+  - version: ussuri-eol
+    projects:
+      - repo: openstack/puppet-vitrage
+        hash: 02298cd18b70fdc5abf1cd5e95839769718f88c3
 branches:
   - name: stable/ussuri
     location: 6.3.0
diff --git a/deliverables/ussuri/puppet-vswitch.yaml b/deliverables/ussuri/puppet-vswitch.yaml
index d9b969bad4..4f0d6f59bf 100644
--- a/deliverables/ussuri/puppet-vswitch.yaml
+++ b/deliverables/ussuri/puppet-vswitch.yaml
@@ -34,6 +34,10 @@ releases:
     projects:
       - repo: openstack/puppet-vswitch
         hash: eac4b9c0a44c68103f5713691b778aebd6dc6b99
+  - version: ussuri-eol
+    projects:
+      - repo: openstack/puppet-vswitch
+        hash: eac4b9c0a44c68103f5713691b778aebd6dc6b99
 branches:
   - name: stable/ussuri
     location: 12.3.0
diff --git a/deliverables/ussuri/puppet-watcher.yaml b/deliverables/ussuri/puppet-watcher.yaml
index ff99dbe830..7f8db28185 100644
--- a/deliverables/ussuri/puppet-watcher.yaml
+++ b/deliverables/ussuri/puppet-watcher.yaml
@@ -34,6 +34,10 @@ releases:
     projects:
       - repo: openstack/puppet-watcher
         hash: 00b682ae2b95766e1e705ff2ee2e542902eaf49c
+  - version: ussuri-eol
+    projects:
+      - repo: openstack/puppet-watcher
+        hash: 00b682ae2b95766e1e705ff2ee2e542902eaf49c
 branches:
   - name: stable/ussuri
     location: 16.3.0
diff --git a/deliverables/ussuri/puppet-zaqar.yaml b/deliverables/ussuri/puppet-zaqar.yaml
index 8252906173..04d635ee6a 100644
--- a/deliverables/ussuri/puppet-zaqar.yaml
+++ b/deliverables/ussuri/puppet-zaqar.yaml
@@ -34,6 +34,10 @@ releases:
     projects:
       - repo: openstack/puppet-zaqar
         hash: 1bbfbd860805af39f03ec8bfe1f4f4e934970cc0
+  - version: ussuri-eol
+    projects:
+      - repo: openstack/puppet-zaqar
+        hash: 53b6dbff351acf1ebc5745898c09e47333389ea3
 branches:
   - name: stable/ussuri
     location: 16.3.0