diff --git a/deliverables/antelope/ec2-api.yaml b/deliverables/antelope/ec2-api.yaml
index 347faf5168..d0d4021037 100644
--- a/deliverables/antelope/ec2-api.yaml
+++ b/deliverables/antelope/ec2-api.yaml
@@ -5,7 +5,9 @@ release-model: cycle-with-rc
 team: ec2-api
 type: service
 repository-settings:
-  openstack/ec2-api: {}
+  openstack/ec2-api:
+    flags:
+      - retired
 releases:
   - version: 16.0.0.0rc1
     projects:
diff --git a/deliverables/antelope/ec2api-tempest-plugin.yaml b/deliverables/antelope/ec2api-tempest-plugin.yaml
index b22564a487..d16631011f 100644
--- a/deliverables/antelope/ec2api-tempest-plugin.yaml
+++ b/deliverables/antelope/ec2api-tempest-plugin.yaml
@@ -5,7 +5,9 @@ release-model: cycle-with-intermediary
 stable-branch-type: none
 release-type: python-pypi
 repository-settings:
-  openstack/ec2api-tempest-plugin: {}
+  openstack/ec2api-tempest-plugin:
+    flags:
+      - retired
 team: ec2-api
 type: tempest-plugin
 releases:
diff --git a/deliverables/bobcat/ec2-api.yaml b/deliverables/bobcat/ec2-api.yaml
index d67d1ead5b..98a3571dd4 100644
--- a/deliverables/bobcat/ec2-api.yaml
+++ b/deliverables/bobcat/ec2-api.yaml
@@ -5,7 +5,9 @@ release-model: cycle-with-rc
 team: ec2-api
 type: service
 repository-settings:
-  openstack/ec2-api: {}
+  openstack/ec2-api:
+    flags:
+      - retired
 releases:
   - version: 17.0.0.0rc1
     projects:
diff --git a/deliverables/bobcat/ec2api-tempest-plugin.yaml b/deliverables/bobcat/ec2api-tempest-plugin.yaml
index ac3d46874e..2250c405ac 100644
--- a/deliverables/bobcat/ec2api-tempest-plugin.yaml
+++ b/deliverables/bobcat/ec2api-tempest-plugin.yaml
@@ -5,7 +5,9 @@ release-model: cycle-with-intermediary
 stable-branch-type: none
 release-type: python-pypi
 repository-settings:
-  openstack/ec2api-tempest-plugin: {}
+  openstack/ec2api-tempest-plugin:
+    flags:
+      - retired
 team: ec2-api
 type: tempest-plugin
 releases:
diff --git a/deliverables/victoria/ec2-api.yaml b/deliverables/victoria/ec2-api.yaml
index 8ff08ffa7c..ee599e6113 100644
--- a/deliverables/victoria/ec2-api.yaml
+++ b/deliverables/victoria/ec2-api.yaml
@@ -5,7 +5,9 @@ release-model: cycle-with-rc
 team: ec2-api
 type: service
 repository-settings:
-  openstack/ec2-api: {}
+  openstack/ec2-api:
+    flags:
+      - retired
 releases:
   - version: 11.0.0.0rc1
     projects:
diff --git a/deliverables/victoria/ec2api-tempest-plugin.yaml b/deliverables/victoria/ec2api-tempest-plugin.yaml
index 9952cfcdf1..19e98b562d 100644
--- a/deliverables/victoria/ec2api-tempest-plugin.yaml
+++ b/deliverables/victoria/ec2api-tempest-plugin.yaml
@@ -5,7 +5,9 @@ release-model: cycle-with-intermediary
 stable-branch-type: none
 release-type: python-pypi
 repository-settings:
-  openstack/ec2api-tempest-plugin: {}
+  openstack/ec2api-tempest-plugin:
+    flags:
+      - retired
 team: ec2-api
 type: tempest-plugin
 releases:
diff --git a/deliverables/wallaby/ec2-api.yaml b/deliverables/wallaby/ec2-api.yaml
index 94b091af81..e3f97144d1 100644
--- a/deliverables/wallaby/ec2-api.yaml
+++ b/deliverables/wallaby/ec2-api.yaml
@@ -5,7 +5,9 @@ release-model: cycle-with-rc
 team: ec2-api
 type: service
 repository-settings:
-  openstack/ec2-api: {}
+  openstack/ec2-api:
+    flags:
+      - retired
 releases:
   - version: 12.0.0.0rc1
     projects:
diff --git a/deliverables/wallaby/ec2api-tempest-plugin.yaml b/deliverables/wallaby/ec2api-tempest-plugin.yaml
index 762868538f..68e8e61fe1 100644
--- a/deliverables/wallaby/ec2api-tempest-plugin.yaml
+++ b/deliverables/wallaby/ec2api-tempest-plugin.yaml
@@ -5,7 +5,9 @@ release-model: cycle-with-intermediary
 stable-branch-type: none
 release-type: python-pypi
 repository-settings:
-  openstack/ec2api-tempest-plugin: {}
+  openstack/ec2api-tempest-plugin:
+    flags:
+      - retired
 team: ec2-api
 type: tempest-plugin
 releases:
diff --git a/deliverables/xena/ec2-api.yaml b/deliverables/xena/ec2-api.yaml
index 2a46ab9d63..2c3803df83 100644
--- a/deliverables/xena/ec2-api.yaml
+++ b/deliverables/xena/ec2-api.yaml
@@ -5,7 +5,9 @@ release-model: cycle-with-rc
 team: ec2-api
 type: service
 repository-settings:
-  openstack/ec2-api: {}
+  openstack/ec2-api:
+    flags:
+      - retired
 releases:
   - version: 13.0.0.0rc1
     projects:
diff --git a/deliverables/xena/ec2api-tempest-plugin.yaml b/deliverables/xena/ec2api-tempest-plugin.yaml
index 3dbe0afaca..2bf4fab2ca 100644
--- a/deliverables/xena/ec2api-tempest-plugin.yaml
+++ b/deliverables/xena/ec2api-tempest-plugin.yaml
@@ -5,7 +5,9 @@ release-model: cycle-with-intermediary
 stable-branch-type: none
 release-type: python-pypi
 repository-settings:
-  openstack/ec2api-tempest-plugin: {}
+  openstack/ec2api-tempest-plugin:
+    flags:
+      - retired
 team: ec2-api
 type: tempest-plugin
 releases:
diff --git a/deliverables/yoga/ec2-api.yaml b/deliverables/yoga/ec2-api.yaml
index 55b7fdb044..f5b8322092 100644
--- a/deliverables/yoga/ec2-api.yaml
+++ b/deliverables/yoga/ec2-api.yaml
@@ -5,7 +5,9 @@ release-model: cycle-with-rc
 team: ec2-api
 type: service
 repository-settings:
-  openstack/ec2-api: {}
+  openstack/ec2-api:
+    flags:
+      - retired
 releases:
   - version: 14.0.0.0rc1
     projects:
diff --git a/deliverables/yoga/ec2api-tempest-plugin.yaml b/deliverables/yoga/ec2api-tempest-plugin.yaml
index d4683cb8fa..cfb0a778b0 100644
--- a/deliverables/yoga/ec2api-tempest-plugin.yaml
+++ b/deliverables/yoga/ec2api-tempest-plugin.yaml
@@ -5,7 +5,9 @@ release-model: cycle-with-intermediary
 stable-branch-type: none
 release-type: python-pypi
 repository-settings:
-  openstack/ec2api-tempest-plugin: {}
+  openstack/ec2api-tempest-plugin:
+    flags:
+      - retired
 team: ec2-api
 type: tempest-plugin
 releases:
diff --git a/deliverables/zed/ec2-api.yaml b/deliverables/zed/ec2-api.yaml
index bd3e9445cb..138f8f20a5 100644
--- a/deliverables/zed/ec2-api.yaml
+++ b/deliverables/zed/ec2-api.yaml
@@ -5,7 +5,9 @@ release-model: cycle-with-rc
 team: ec2-api
 type: service
 repository-settings:
-  openstack/ec2-api: {}
+  openstack/ec2-api:
+    flags:
+      - retired
 releases:
   - version: 15.0.0.0rc1
     projects:
diff --git a/deliverables/zed/ec2api-tempest-plugin.yaml b/deliverables/zed/ec2api-tempest-plugin.yaml
index a049a14084..dfb5711462 100644
--- a/deliverables/zed/ec2api-tempest-plugin.yaml
+++ b/deliverables/zed/ec2api-tempest-plugin.yaml
@@ -5,7 +5,9 @@ release-model: cycle-with-intermediary
 stable-branch-type: none
 release-type: python-pypi
 repository-settings:
-  openstack/ec2api-tempest-plugin: {}
+  openstack/ec2api-tempest-plugin:
+    flags:
+      - retired
 team: ec2-api
 type: tempest-plugin
 releases: