diff --git a/deliverables/victoria/mistral-dashboard.yaml b/deliverables/victoria/mistral-dashboard.yaml
index aa05294769..c51c07214d 100644
--- a/deliverables/victoria/mistral-dashboard.yaml
+++ b/deliverables/victoria/mistral-dashboard.yaml
@@ -24,6 +24,12 @@ releases:
     projects:
       - repo: openstack/mistral-dashboard
         hash: e1936e4886f5fee1076b4a9ef7276a44aadce896
+  - version: victoria-eom
+    projects:
+      - repo: openstack/mistral-dashboard
+        hash: e1936e4886f5fee1076b4a9ef7276a44aadce896
 branches:
   - name: stable/victoria
     location: 11.0.0.0rc1
+  - name: unmaintained/victoria
+    location: victoria-eom
diff --git a/deliverables/victoria/mistral-extra.yaml b/deliverables/victoria/mistral-extra.yaml
index 100e81c206..2f757118c3 100644
--- a/deliverables/victoria/mistral-extra.yaml
+++ b/deliverables/victoria/mistral-extra.yaml
@@ -15,7 +15,14 @@ releases:
     projects:
       - repo: openstack/mistral-extra
         hash: b5e08f227699b4f459336ee098b5b8576e5c0e50
+  - version: victoria-eom
+    projects:
+      - repo: openstack/mistral-extra
+        hash: e47d8fe17e6cdfd2eccd25b83ddb765180efcfa7
 branches:
   - name: stable/victoria
     location: 10.1.0
-release-notes: https://docs.openstack.org/releasenotes/mistral-extra/victoria.html
+  - name: unmaintained/victoria
+    location: victoria-eom
+release-notes:
+  https://docs.openstack.org/releasenotes/mistral-extra/victoria.html
diff --git a/deliverables/victoria/mistral-lib.yaml b/deliverables/victoria/mistral-lib.yaml
index 585c6edb70..05a5d18c7f 100644
--- a/deliverables/victoria/mistral-lib.yaml
+++ b/deliverables/victoria/mistral-lib.yaml
@@ -19,7 +19,13 @@ releases:
     projects:
       - repo: openstack/mistral-lib
         hash: 245c1272f2219991194cfead55d03277e68cccd7
+  - version: victoria-eom
+    projects:
+      - repo: openstack/mistral-lib
+        hash: 1110feefe6c47efbe74f1d5fbd0ec27e8bdbc646
 branches:
   - name: stable/victoria
     location: 2.3.0
+  - name: unmaintained/victoria
+    location: victoria-eom
 release-notes: https://docs.openstack.org/releasenotes/mistral-lib/victoria.html
diff --git a/deliverables/victoria/mistral.yaml b/deliverables/victoria/mistral.yaml
index 05417f3024..235aee2d1d 100644
--- a/deliverables/victoria/mistral.yaml
+++ b/deliverables/victoria/mistral.yaml
@@ -20,7 +20,13 @@ releases:
     projects:
       - repo: openstack/mistral
         hash: 068e5cc0e9ab73a3046a6b8de251079a784b9139
+  - version: victoria-eom
+    projects:
+      - repo: openstack/mistral
+        hash: 6ea2ccc111d87acf3d9b5533364a348c961d97b4
 branches:
   - name: stable/victoria
     location: 11.0.0.0rc1
+  - name: unmaintained/victoria
+    location: victoria-eom
 release-notes: https://docs.openstack.org/releasenotes/mistral/victoria.html
diff --git a/deliverables/victoria/python-mistralclient.yaml b/deliverables/victoria/python-mistralclient.yaml
index b0c54b0ca0..3d6b2718a6 100644
--- a/deliverables/victoria/python-mistralclient.yaml
+++ b/deliverables/victoria/python-mistralclient.yaml
@@ -19,7 +19,14 @@ releases:
     projects:
       - repo: openstack/python-mistralclient
         hash: 471e37df0218844d7693f31848037e768460f244
+  - version: victoria-eom
+    projects:
+      - repo: openstack/python-mistralclient
+        hash: 8c008dd597f753d951205179e3399d140e936d0e
 branches:
   - name: stable/victoria
     location: 4.1.1
-release-notes: https://docs.openstack.org/releasenotes/python-mistralclient/victoria.html
+  - name: unmaintained/victoria
+    location: victoria-eom
+release-notes:
+  https://docs.openstack.org/releasenotes/python-mistralclient/victoria.html
diff --git a/deliverables/wallaby/mistral-dashboard.yaml b/deliverables/wallaby/mistral-dashboard.yaml
index df1f17ddac..c79f575af0 100644
--- a/deliverables/wallaby/mistral-dashboard.yaml
+++ b/deliverables/wallaby/mistral-dashboard.yaml
@@ -24,6 +24,12 @@ releases:
     projects:
       - repo: openstack/mistral-dashboard
         hash: 7cee9c9cbfc0cd5c1b1027c6f4e9c87887c302bb
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/mistral-dashboard
+        hash: 7cee9c9cbfc0cd5c1b1027c6f4e9c87887c302bb
 branches:
   - name: stable/wallaby
     location: 12.0.0.0rc1
+  - name: unmaintained/wallaby
+    location: wallaby-eom
diff --git a/deliverables/wallaby/mistral-extra.yaml b/deliverables/wallaby/mistral-extra.yaml
index e750f4aba1..d2ca80a4ae 100644
--- a/deliverables/wallaby/mistral-extra.yaml
+++ b/deliverables/wallaby/mistral-extra.yaml
@@ -15,7 +15,13 @@ releases:
     projects:
       - repo: openstack/mistral-extra
         hash: dfc6c56490eb358018f79822ae9847e2be89d8b3
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/mistral-extra
+        hash: d34df63c3aa88e9cade80a8bfc99a594ede043f1
 branches:
   - name: stable/wallaby
     location: 11.0.0
+  - name: unmaintained/wallaby
+    location: wallaby-eom
 release-notes: https://docs.openstack.org/releasenotes/mistral-extra/wallaby.html
diff --git a/deliverables/wallaby/mistral-lib.yaml b/deliverables/wallaby/mistral-lib.yaml
index b19899847e..3ea9849678 100644
--- a/deliverables/wallaby/mistral-lib.yaml
+++ b/deliverables/wallaby/mistral-lib.yaml
@@ -15,7 +15,13 @@ releases:
     projects:
       - repo: openstack/mistral-lib
         hash: 95724c5ad0d249e8774d12c306c89dba000e2d33
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/mistral-lib
+        hash: 95724c5ad0d249e8774d12c306c89dba000e2d33
 branches:
   - name: stable/wallaby
     location: 2.4.0
+  - name: unmaintained/wallaby
+    location: wallaby-eom
 release-notes: https://docs.openstack.org/releasenotes/mistral-lib/wallaby.html
diff --git a/deliverables/wallaby/mistral.yaml b/deliverables/wallaby/mistral.yaml
index e3d58f1f73..f5527e8703 100644
--- a/deliverables/wallaby/mistral.yaml
+++ b/deliverables/wallaby/mistral.yaml
@@ -20,7 +20,13 @@ releases:
     projects:
       - repo: openstack/mistral
         hash: 3c83837f6ce1e4ab74fb519a63e82eaae70f9d2d
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/mistral
+        hash: b1a8bbdc7b2809bcdc639d6b1378665be6126dd5
 branches:
   - name: stable/wallaby
     location: 12.0.0.0rc1
+  - name: unmaintained/wallaby
+    location: wallaby-eom
 release-notes: https://docs.openstack.org/releasenotes/mistral/wallaby.html
diff --git a/deliverables/wallaby/python-mistralclient.yaml b/deliverables/wallaby/python-mistralclient.yaml
index 975f4cb852..7c886ed356 100644
--- a/deliverables/wallaby/python-mistralclient.yaml
+++ b/deliverables/wallaby/python-mistralclient.yaml
@@ -15,7 +15,14 @@ releases:
     projects:
       - repo: openstack/python-mistralclient
         hash: 20a10f0fb54e98368afc92639f6a15ed4a0aa218
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/python-mistralclient
+        hash: e3401cf967f97500e8c144872e60346b652f7a9c
 branches:
   - name: stable/wallaby
     location: 4.2.0
-release-notes: https://docs.openstack.org/releasenotes/python-mistralclient/wallaby.html
+  - name: unmaintained/wallaby
+    location: wallaby-eom
+release-notes:
+  https://docs.openstack.org/releasenotes/python-mistralclient/wallaby.html
diff --git a/deliverables/xena/mistral-dashboard.yaml b/deliverables/xena/mistral-dashboard.yaml
index 1f494baea2..33f0f3f4e3 100644
--- a/deliverables/xena/mistral-dashboard.yaml
+++ b/deliverables/xena/mistral-dashboard.yaml
@@ -20,6 +20,12 @@ releases:
     projects:
       - repo: openstack/mistral-dashboard
         hash: 2980dfc44f11400c75a1113e468f50e7c6d6396c
+  - version: xena-eom
+    projects:
+      - repo: openstack/mistral-dashboard
+        hash: 7268cad74d56241b64da353a1e20b2a4ef307348
 branches:
   - name: stable/xena
     location: 13.0.0.0rc1
+  - name: unmaintained/xena
+    location: xena-eom
diff --git a/deliverables/xena/mistral-extra.yaml b/deliverables/xena/mistral-extra.yaml
index 4cb6243cc9..a3521a4278 100644
--- a/deliverables/xena/mistral-extra.yaml
+++ b/deliverables/xena/mistral-extra.yaml
@@ -15,7 +15,13 @@ releases:
     projects:
       - repo: openstack/mistral-extra
         hash: acd70beba1bdf7189291a6a1a65ce45393ecac6d
+  - version: xena-eom
+    projects:
+      - repo: openstack/mistral-extra
+        hash: 578355f349d19b5529a07ca1f3492422f1c1d232
 branches:
   - name: stable/xena
     location: 11.1.0
+  - name: unmaintained/xena
+    location: xena-eom
 release-notes: https://docs.openstack.org/releasenotes/mistral-extra/xena.html
diff --git a/deliverables/xena/mistral-lib.yaml b/deliverables/xena/mistral-lib.yaml
index 1375f9e0c9..9620ef74f5 100644
--- a/deliverables/xena/mistral-lib.yaml
+++ b/deliverables/xena/mistral-lib.yaml
@@ -15,6 +15,12 @@ releases:
     projects:
       - repo: openstack/mistral-lib
         hash: 44c33f2ccd8b059f68db59114c71ba95dfae574d
+  - version: xena-eom
+    projects:
+      - repo: openstack/mistral-lib
+        hash: 034ae3ca30f5ace308104f856738dc05f78e66f1
 branches:
   - name: stable/xena
     location: 2.5.0
+  - name: unmaintained/xena
+    location: xena-eom
diff --git a/deliverables/xena/mistral.yaml b/deliverables/xena/mistral.yaml
index 61f296ea05..0792d1f851 100644
--- a/deliverables/xena/mistral.yaml
+++ b/deliverables/xena/mistral.yaml
@@ -20,7 +20,13 @@ releases:
     projects:
       - repo: openstack/mistral
         hash: b2d6de569c7bba96cd3179189ffbcee6b7a28c1f
+  - version: xena-eom
+    projects:
+      - repo: openstack/mistral
+        hash: 78d225b32d221292c3458a605fb3e4da138e020a
 branches:
   - name: stable/xena
     location: 13.0.0.0rc1
+  - name: unmaintained/xena
+    location: xena-eom
 release-notes: https://docs.openstack.org/releasenotes/mistral/xena.html
diff --git a/deliverables/xena/python-mistralclient.yaml b/deliverables/xena/python-mistralclient.yaml
index f5bc0f850c..b55e72b1f7 100644
--- a/deliverables/xena/python-mistralclient.yaml
+++ b/deliverables/xena/python-mistralclient.yaml
@@ -15,6 +15,12 @@ releases:
     projects:
       - repo: openstack/python-mistralclient
         hash: 608ec45cef72d822d1242e0aefcea7d044662adc
+  - version: xena-eom
+    projects:
+      - repo: openstack/python-mistralclient
+        hash: 608ec45cef72d822d1242e0aefcea7d044662adc
 branches:
   - name: stable/xena
     location: 4.3.0
+  - name: unmaintained/xena
+    location: xena-eom