diff --git a/deliverables/yoga/aodh.yaml b/deliverables/yoga/aodh.yaml
index c4bc0aeacb..443b5c0b7a 100644
--- a/deliverables/yoga/aodh.yaml
+++ b/deliverables/yoga/aodh.yaml
@@ -19,7 +19,13 @@ releases:
     projects:
       - repo: openstack/aodh
         hash: f9abe01eb14416474c2bc3c15311b5235adbf661
+  - version: yoga-eom
+    projects:
+      - repo: openstack/aodh
+        hash: 02ac4af451b1d6b3d031dc1ab26c648d3b3b0c68
 branches:
   - name: stable/yoga
     location: 14.0.0.0rc1
+  - name: unmaintained/yoga
+    location: yoga-eom
 release-notes: https://docs.openstack.org/releasenotes/aodh/yoga.html
diff --git a/deliverables/yoga/ceilometer.yaml b/deliverables/yoga/ceilometer.yaml
index 1b130bd5ad..619eceb295 100644
--- a/deliverables/yoga/ceilometer.yaml
+++ b/deliverables/yoga/ceilometer.yaml
@@ -19,7 +19,13 @@ releases:
     projects:
       - repo: openstack/ceilometer
         hash: 82feb96ed324dca8cbf4773bbdf91eb9e33d7b67
+  - version: yoga-eom
+    projects:
+      - repo: openstack/ceilometer
+        hash: 53f31524ee9ea0082ad17b9ee2d0005b5f85df30
 branches:
   - name: stable/yoga
     location: 18.0.0.0rc1
+  - name: unmaintained/yoga
+    location: yoga-eom
 release-notes: https://docs.openstack.org/releasenotes/ceilometer/yoga.html
diff --git a/deliverables/yoga/ceilometermiddleware.yaml b/deliverables/yoga/ceilometermiddleware.yaml
index e7a02416b2..912053ef31 100644
--- a/deliverables/yoga/ceilometermiddleware.yaml
+++ b/deliverables/yoga/ceilometermiddleware.yaml
@@ -15,7 +15,14 @@ releases:
     projects:
       - repo: openstack/ceilometermiddleware
         hash: 4a2da3e28da69fc3b319c6f1a0fe40d909882f79
+  - version: yoga-eom
+    projects:
+      - repo: openstack/ceilometermiddleware
+        hash: 2cf19123102d58986071ac1cdbd4b53b544fe2c8
 branches:
   - name: stable/yoga
     location: 2.4.1
-release-notes: https://docs.openstack.org/releasenotes/ceilometermiddleware/yoga.html
+  - name: unmaintained/yoga
+    location: yoga-eom
+release-notes:
+  https://docs.openstack.org/releasenotes/ceilometermiddleware/yoga.html
diff --git a/deliverables/yoga/python-aodhclient.yaml b/deliverables/yoga/python-aodhclient.yaml
index 818b33aef1..b97aa53549 100644
--- a/deliverables/yoga/python-aodhclient.yaml
+++ b/deliverables/yoga/python-aodhclient.yaml
@@ -16,6 +16,12 @@ releases:
     projects:
       - repo: openstack/python-aodhclient
         hash: c1d7fe16ff4da5a1d1dc61e379b58ace9945b818
+  - version: yoga-eom
+    projects:
+      - repo: openstack/python-aodhclient
+        hash: 621b4aef88edcb34712c2060a27a9f10431974d7
 branches:
   - name: stable/yoga
     location: 2.4.1
+  - name: unmaintained/yoga
+    location: yoga-eom