diff --git a/deliverables/yoga/cyborg.yaml b/deliverables/yoga/cyborg.yaml
index 628182b4c3..9d8cebd5fe 100644
--- a/deliverables/yoga/cyborg.yaml
+++ b/deliverables/yoga/cyborg.yaml
@@ -30,7 +30,13 @@ releases:
     projects:
       - repo: openstack/cyborg
         hash: df5a1bdac86ab5f5d96d599ec452ba360ed9016a
+  - version: yoga-eom
+    projects:
+      - repo: openstack/cyborg
+        hash: df5a1bdac86ab5f5d96d599ec452ba360ed9016a
 branches:
   - name: stable/yoga
     location: 8.0.0.0rc1
+  - name: unmaintained/yoga
+    location: yoga-eom
 release-notes: https://docs.openstack.org/releasenotes/cyborg/yoga.html
diff --git a/deliverables/yoga/python-cyborgclient.yaml b/deliverables/yoga/python-cyborgclient.yaml
index 4b9fce0a14..25d908b7e9 100644
--- a/deliverables/yoga/python-cyborgclient.yaml
+++ b/deliverables/yoga/python-cyborgclient.yaml
@@ -15,6 +15,12 @@ releases:
     projects:
       - repo: openstack/python-cyborgclient
         hash: 37026cc88903dfeb5c4f9b768b24f8b8db614123
+  - version: yoga-eom
+    projects:
+      - repo: openstack/python-cyborgclient
+        hash: 858aa4a34f88ffbb78d86f22baa630ffef0edcda
 branches:
   - name: stable/yoga
     location: 1.7.0
+  - name: unmaintained/yoga
+    location: yoga-eom