diff --git a/deliverables/yoga/cloudkitty-dashboard.yaml b/deliverables/yoga/cloudkitty-dashboard.yaml
index 96eb8c51eb..67e905f10f 100644
--- a/deliverables/yoga/cloudkitty-dashboard.yaml
+++ b/deliverables/yoga/cloudkitty-dashboard.yaml
@@ -20,7 +20,14 @@ releases:
     projects:
       - repo: openstack/cloudkitty-dashboard
         hash: f3f3b9f2656c329ddc5d74179b5ceffb4fa8fb50
+  - version: yoga-eom
+    projects:
+      - repo: openstack/cloudkitty-dashboard
+        hash: f3f3b9f2656c329ddc5d74179b5ceffb4fa8fb50
 branches:
   - name: stable/yoga
     location: 14.0.0.0rc1
-release-notes: https://docs.openstack.org/releasenotes/cloudkitty-dashboard/yoga.html
+  - name: unmaintained/yoga
+    location: yoga-eom
+release-notes:
+  https://docs.openstack.org/releasenotes/cloudkitty-dashboard/yoga.html
diff --git a/deliverables/yoga/cloudkitty.yaml b/deliverables/yoga/cloudkitty.yaml
index 8dd24b2c7a..622389a77b 100644
--- a/deliverables/yoga/cloudkitty.yaml
+++ b/deliverables/yoga/cloudkitty.yaml
@@ -20,7 +20,13 @@ releases:
     projects:
       - repo: openstack/cloudkitty
         hash: 83f99abb930617a249fe902e44845fd6ab7f0bff
+  - version: yoga-eom
+    projects:
+      - repo: openstack/cloudkitty
+        hash: 119e8577b842fb7027af32fae780d9e017317283
 branches:
   - name: stable/yoga
     location: 16.0.0.0rc1
+  - name: unmaintained/yoga
+    location: yoga-eom
 release-notes: https://docs.openstack.org/releasenotes/cloudkitty/yoga.html
diff --git a/deliverables/yoga/python-cloudkittyclient.yaml b/deliverables/yoga/python-cloudkittyclient.yaml
index 28dd466bee..03ec8383f5 100644
--- a/deliverables/yoga/python-cloudkittyclient.yaml
+++ b/deliverables/yoga/python-cloudkittyclient.yaml
@@ -15,7 +15,14 @@ releases:
     projects:
       - repo: openstack/python-cloudkittyclient
         hash: 783cc22662ad4195c3ad0289985177e5e32ec480
+  - version: yoga-eom
+    projects:
+      - repo: openstack/python-cloudkittyclient
+        hash: fd63893bbeb56c2fef63b22a78b1c8a892635dac
 branches:
   - name: stable/yoga
     location: 4.5.0
-release-notes: https://docs.openstack.org/releasenotes/python-cloudkittyclient/yoga.html
+  - name: unmaintained/yoga
+    location: yoga-eom
+release-notes:
+  https://docs.openstack.org/releasenotes/python-cloudkittyclient/yoga.html