diff --git a/deliverables/yoga/python-zunclient.yaml b/deliverables/yoga/python-zunclient.yaml
index 9f6a6eb830..5003b0fbf6 100644
--- a/deliverables/yoga/python-zunclient.yaml
+++ b/deliverables/yoga/python-zunclient.yaml
@@ -11,6 +11,12 @@ releases:
     projects:
       - repo: openstack/python-zunclient
         hash: 2284443ac9572ef337df38424f69a820c369de38
+  - version: yoga-eom
+    projects:
+      - repo: openstack/python-zunclient
+        hash: 382bab7c237ccf2c15dd4f1f2d721e220d39c6bf
 branches:
   - name: stable/yoga
     location: 4.4.0
+  - name: unmaintained/yoga
+    location: yoga-eom
diff --git a/deliverables/yoga/zun-ui.yaml b/deliverables/yoga/zun-ui.yaml
index cacb92d917..32bd0884c7 100644
--- a/deliverables/yoga/zun-ui.yaml
+++ b/deliverables/yoga/zun-ui.yaml
@@ -15,7 +15,13 @@ releases:
       - repo: openstack/zun-ui
         hash: 20ae779160643bcce708c04ddcdce21910bd5d41
     diff-start: 8.0.0
+  - version: yoga-eom
+    projects:
+      - repo: openstack/zun-ui
+        hash: bbccc2399bc180ff5adb475c543bff28856e05b9
 branches:
   - name: stable/yoga
     location: 9.0.0.0rc1
+  - name: unmaintained/yoga
+    location: yoga-eom
 release-notes: https://docs.openstack.org/releasenotes/zun-ui/yoga.html
diff --git a/deliverables/yoga/zun.yaml b/deliverables/yoga/zun.yaml
index 28d2c0cb76..b878a5891b 100644
--- a/deliverables/yoga/zun.yaml
+++ b/deliverables/yoga/zun.yaml
@@ -19,7 +19,13 @@ releases:
     projects:
       - repo: openstack/zun
         hash: 77fcbbefead3fbd79be25971d9b94ce0359cecda
+  - version: yoga-eom
+    projects:
+      - repo: openstack/zun
+        hash: 77fcbbefead3fbd79be25971d9b94ce0359cecda
 branches:
   - name: stable/yoga
     location: 9.0.0.0rc1
+  - name: unmaintained/yoga
+    location: yoga-eom
 release-notes: https://docs.openstack.org/releasenotes/zun/yoga.html