diff --git a/deliverables/victoria/python-watcherclient.yaml b/deliverables/victoria/python-watcherclient.yaml
index dd0b7bf105..f27121f85c 100644
--- a/deliverables/victoria/python-watcherclient.yaml
+++ b/deliverables/victoria/python-watcherclient.yaml
@@ -19,6 +19,12 @@ releases:
     projects:
       - repo: openstack/python-watcherclient
         hash: 80f728b14f821f98a87c230516fea96d167d6550
+  - version: victoria-eom
+    projects:
+      - repo: openstack/python-watcherclient
+        hash: f170e7715eeba2c63fac437a6f67313380933e8e
 branches:
   - name: stable/victoria
     location: 3.1.1
+  - name: unmaintained/victoria
+    location: victoria-eom
diff --git a/deliverables/victoria/watcher-dashboard.yaml b/deliverables/victoria/watcher-dashboard.yaml
index aec006e66c..9445a7c8a1 100644
--- a/deliverables/victoria/watcher-dashboard.yaml
+++ b/deliverables/victoria/watcher-dashboard.yaml
@@ -24,7 +24,14 @@ releases:
     projects:
       - repo: openstack/watcher-dashboard
         hash: 4498a25d7e91aa1737a46f6016a2bf7d0bf92a31
+  - version: victoria-eom
+    projects:
+      - repo: openstack/watcher-dashboard
+        hash: 4498a25d7e91aa1737a46f6016a2bf7d0bf92a31
 branches:
   - name: stable/victoria
     location: 4.0.0.0rc1
-release-notes: https://docs.openstack.org/releasenotes/watcher-dashboard/victoria.html
+  - name: unmaintained/victoria
+    location: victoria-eom
+release-notes:
+  https://docs.openstack.org/releasenotes/watcher-dashboard/victoria.html
diff --git a/deliverables/victoria/watcher.yaml b/deliverables/victoria/watcher.yaml
index 0bd9d44531..77750d1da8 100644
--- a/deliverables/victoria/watcher.yaml
+++ b/deliverables/victoria/watcher.yaml
@@ -20,7 +20,13 @@ releases:
     projects:
       - repo: openstack/watcher
         hash: 583c946061f8af815c32254655f4aed8f0c18dc9
+  - version: victoria-eom
+    projects:
+      - repo: openstack/watcher
+        hash: ab64069e237daa2a8868a8db67ece5fea39a645a
 branches:
   - name: stable/victoria
     location: 5.0.0.0rc1
+  - name: unmaintained/victoria
+    location: victoria-eom
 release-notes: https://docs.openstack.org/releasenotes/watcher/victoria.html
diff --git a/deliverables/wallaby/python-watcherclient.yaml b/deliverables/wallaby/python-watcherclient.yaml
index 21e3b6d62f..0ce364151e 100644
--- a/deliverables/wallaby/python-watcherclient.yaml
+++ b/deliverables/wallaby/python-watcherclient.yaml
@@ -15,6 +15,12 @@ releases:
     projects:
       - repo: openstack/python-watcherclient
         hash: 6a33b44d7f989043e448030c518210744b35a08e
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/python-watcherclient
+        hash: 671a8fbce92a675bf04035e1352f26b0449d3373
 branches:
   - name: stable/wallaby
     location: 3.2.0
+  - name: unmaintained/wallaby
+    location: wallaby-eom
diff --git a/deliverables/wallaby/watcher-dashboard.yaml b/deliverables/wallaby/watcher-dashboard.yaml
index 12f698fa85..25c66dcc8a 100644
--- a/deliverables/wallaby/watcher-dashboard.yaml
+++ b/deliverables/wallaby/watcher-dashboard.yaml
@@ -24,7 +24,14 @@ releases:
     projects:
       - repo: openstack/watcher-dashboard
         hash: ce5b07f3a2c03c351ca216e7ece81da82e3262ae
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/watcher-dashboard
+        hash: ce5b07f3a2c03c351ca216e7ece81da82e3262ae
 branches:
   - name: stable/wallaby
     location: 5.0.0.0rc1
-release-notes: https://docs.openstack.org/releasenotes/watcher-dashboard/wallaby.html
+  - name: unmaintained/wallaby
+    location: wallaby-eom
+release-notes:
+  https://docs.openstack.org/releasenotes/watcher-dashboard/wallaby.html
diff --git a/deliverables/wallaby/watcher.yaml b/deliverables/wallaby/watcher.yaml
index 2242973075..4c3dbf1dcb 100644
--- a/deliverables/wallaby/watcher.yaml
+++ b/deliverables/wallaby/watcher.yaml
@@ -24,7 +24,13 @@ releases:
     projects:
       - repo: openstack/watcher
         hash: d60e2a96e4997a1d0ed1ac73d6ea9b622c1dd73f
+  - version: wallaby-eom
+    projects:
+      - repo: openstack/watcher
+        hash: ab6cd112d7660bb67af23467bcd660814967aa2c
 branches:
   - name: stable/wallaby
     location: 6.0.0.0rc1
+  - name: unmaintained/wallaby
+    location: wallaby-eom
 release-notes: https://docs.openstack.org/releasenotes/watcher/wallaby.html
diff --git a/deliverables/xena/python-watcherclient.yaml b/deliverables/xena/python-watcherclient.yaml
index 4a5a1dd958..6ae31d0c78 100644
--- a/deliverables/xena/python-watcherclient.yaml
+++ b/deliverables/xena/python-watcherclient.yaml
@@ -15,6 +15,12 @@ releases:
     projects:
       - repo: openstack/python-watcherclient
         hash: dc9b5cb347bc50595670fa9df90c00d52734395d
+  - version: xena-eom
+    projects:
+      - repo: openstack/python-watcherclient
+        hash: 1fc5643008a4c10896c3b392ce60d83bc11e58f0
 branches:
   - name: stable/xena
     location: 3.3.0
+  - name: unmaintained/xena
+    location: xena-eom
diff --git a/deliverables/xena/watcher-dashboard.yaml b/deliverables/xena/watcher-dashboard.yaml
index ea5c50a79f..076f84b368 100644
--- a/deliverables/xena/watcher-dashboard.yaml
+++ b/deliverables/xena/watcher-dashboard.yaml
@@ -20,7 +20,14 @@ releases:
     projects:
       - repo: openstack/watcher-dashboard
         hash: 4192182302a9f81b2cac5aff484161afc776c750
+  - version: xena-eom
+    projects:
+      - repo: openstack/watcher-dashboard
+        hash: 2ebb3b4e7849eda83903b5c3b87000ea20db2b43
 branches:
   - name: stable/xena
     location: 6.0.0.0rc1
-release-notes: https://docs.openstack.org/releasenotes/watcher-dashboard/xena.html
+  - name: unmaintained/xena
+    location: xena-eom
+release-notes:
+  https://docs.openstack.org/releasenotes/watcher-dashboard/xena.html
diff --git a/deliverables/xena/watcher.yaml b/deliverables/xena/watcher.yaml
index 939b4634ec..fa34f169b4 100644
--- a/deliverables/xena/watcher.yaml
+++ b/deliverables/xena/watcher.yaml
@@ -20,7 +20,13 @@ releases:
     projects:
       - repo: openstack/watcher
         hash: 6dd2f2a9c100e8620d33855e3438e9c00976006a
+  - version: xena-eom
+    projects:
+      - repo: openstack/watcher
+        hash: a1e38debf632097d1c37499c51cbcbab7dbcf9aa
 branches:
   - name: stable/xena
     location: 7.0.0.0rc1
+  - name: unmaintained/xena
+    location: xena-eom
 release-notes: https://docs.openstack.org/releasenotes/watcher/xena.html