diff --git a/deliverables/pike/aodh.yaml b/deliverables/pike/aodh.yaml
index edacf8ef80..5d6fe6daf1 100644
--- a/deliverables/pike/aodh.yaml
+++ b/deliverables/pike/aodh.yaml
@@ -17,3 +17,5 @@ releases:
 branches:
   - location: 5.0.0
     name: stable/pike
+repository-settings:
+  openstack/aodh: {}
diff --git a/deliverables/pike/automaton.yaml b/deliverables/pike/automaton.yaml
index 37b9d1ca7b..18221221c6 100644
--- a/deliverables/pike/automaton.yaml
+++ b/deliverables/pike/automaton.yaml
@@ -33,3 +33,5 @@ releases:
     version: 1.12.1
 team: oslo
 type: library
+repository-settings:
+  openstack/automaton: {}
diff --git a/deliverables/pike/barbican.yaml b/deliverables/pike/barbican.yaml
index 106d5cb0d4..fa5e1d9011 100644
--- a/deliverables/pike/barbican.yaml
+++ b/deliverables/pike/barbican.yaml
@@ -29,3 +29,5 @@ releases:
 branches:
   - location: 5.0.0.0rc1
     name: stable/pike
+repository-settings:
+  openstack/barbican: {}
diff --git a/deliverables/pike/bifrost.yaml b/deliverables/pike/bifrost.yaml
index 76d9aa99e6..a212a56063 100644
--- a/deliverables/pike/bifrost.yaml
+++ b/deliverables/pike/bifrost.yaml
@@ -12,3 +12,5 @@ releases:
 branches:
   - name: stable/pike
     location: 4.0.0
+repository-settings:
+  openstack/bifrost: {}
diff --git a/deliverables/pike/castellan.yaml b/deliverables/pike/castellan.yaml
index 7269a6a380..8fb67cd411 100644
--- a/deliverables/pike/castellan.yaml
+++ b/deliverables/pike/castellan.yaml
@@ -48,3 +48,5 @@ branches:
   - name: stable/pike
     location: 0.12.0
 release-notes: https://docs.openstack.org/releasenotes/castellan/pike.html
+repository-settings:
+  openstack/castellan: {}
diff --git a/deliverables/pike/ceilometer.yaml b/deliverables/pike/ceilometer.yaml
index 350993af83..f94827f7c6 100644
--- a/deliverables/pike/ceilometer.yaml
+++ b/deliverables/pike/ceilometer.yaml
@@ -28,3 +28,5 @@ releases:
 branches:
   - location: 9.0.0
     name: stable/pike
+repository-settings:
+  openstack/ceilometer: {}
diff --git a/deliverables/pike/ceilometermiddleware.yaml b/deliverables/pike/ceilometermiddleware.yaml
index 0c5ab920df..72b981860c 100644
--- a/deliverables/pike/ceilometermiddleware.yaml
+++ b/deliverables/pike/ceilometermiddleware.yaml
@@ -17,3 +17,5 @@ branches:
   - name: stable/pike
     location: 1.1.0
 release-notes: https://docs.openstack.org/releasenotes/ceilometermiddleware/pike.html
+repository-settings:
+  openstack/ceilometermiddleware: {}
diff --git a/deliverables/pike/cinder.yaml b/deliverables/pike/cinder.yaml
index c04953535f..61b8391c1e 100644
--- a/deliverables/pike/cinder.yaml
+++ b/deliverables/pike/cinder.yaml
@@ -41,3 +41,5 @@ releases:
 branches:
   - location: 11.0.0.0rc1
     name: stable/pike
+repository-settings:
+  openstack/cinder: {}
diff --git a/deliverables/pike/cliff.yaml b/deliverables/pike/cliff.yaml
index f8b650e2fd..9fff46ad30 100644
--- a/deliverables/pike/cliff.yaml
+++ b/deliverables/pike/cliff.yaml
@@ -24,3 +24,5 @@ releases:
 branches:
   - name: stable/pike
     location: 2.8.0
+repository-settings:
+  openstack/cliff: {}
diff --git a/deliverables/pike/cloudkitty-dashboard.yaml b/deliverables/pike/cloudkitty-dashboard.yaml
index 1174dbf99c..e6a18d9e8d 100644
--- a/deliverables/pike/cloudkitty-dashboard.yaml
+++ b/deliverables/pike/cloudkitty-dashboard.yaml
@@ -1,5 +1,5 @@
 ---
-include-pypi-link: true
+include-pypi-link: yes
 launchpad: cloudkitty
 release-model: cycle-with-intermediary
 team: cloudkitty
@@ -12,6 +12,7 @@ releases:
     projects:
       - repo: openstack/cloudkitty-dashboard
         hash: ccb1c3831b9a66c98b2577d65ac0990b8e7551eb
-    highlights: >
-      - Update the requirements
-      - Fix issues created by django 1.8 dependencies
+    highlights: |
+      - Update the requirements - Fix issues created by django 1.8 dependencies
+repository-settings:
+  openstack/cloudkitty-dashboard: {}
diff --git a/deliverables/pike/cloudkitty.yaml b/deliverables/pike/cloudkitty.yaml
index 0a5f06177b..8a098d5566 100644
--- a/deliverables/pike/cloudkitty.yaml
+++ b/deliverables/pike/cloudkitty.yaml
@@ -20,4 +20,13 @@ releases:
       - Updated documentation
       - Update the devstack plugin
       - Fix the generated configuration samples
+      - Add WSGI support for `cloudkitty-api'
+      - Switch from oslosphinx to openstackdocstheme
+      - Update URLs in documents according to document migration
+      - Fix and improve the gnocchi and gnocchihybrid storage
+      - Updated documentation
+      - Update the devstack plugin
+      - Fix the generated configuration samples
+repository-settings:
+  openstack/cloudkitty: {}
 release-notes: https://docs.openstack.org/releasenotes/cloudkitty/pike.html
diff --git a/deliverables/pike/congress-dashboard.yaml b/deliverables/pike/congress-dashboard.yaml
index b46dfba614..8c4c05ad7e 100644
--- a/deliverables/pike/congress-dashboard.yaml
+++ b/deliverables/pike/congress-dashboard.yaml
@@ -28,3 +28,5 @@ branches:
   - location: 1.0.0.0rc1
     name: stable/pike
 release-notes: https://docs.openstack.org/releasenotes/congress-dashboard/pike.html
+repository-settings:
+  openstack/congress-dashboard: {}
diff --git a/deliverables/pike/congress.yaml b/deliverables/pike/congress.yaml
index 7e27ab5e08..4847681401 100644
--- a/deliverables/pike/congress.yaml
+++ b/deliverables/pike/congress.yaml
@@ -32,3 +32,5 @@ branches:
   - location: 6.0.0.0rc1
     name: stable/pike
 release-notes: https://docs.openstack.org/releasenotes/congress/pike.html
+repository-settings:
+  openstack/congress: {}
diff --git a/deliverables/pike/debtcollector.yaml b/deliverables/pike/debtcollector.yaml
index 22e1b5d262..724084c57e 100644
--- a/deliverables/pike/debtcollector.yaml
+++ b/deliverables/pike/debtcollector.yaml
@@ -37,3 +37,5 @@ releases:
     version: 1.17.1
 team: oslo
 type: library
+repository-settings:
+  openstack/debtcollector: {}
diff --git a/deliverables/pike/designate-dashboard.yaml b/deliverables/pike/designate-dashboard.yaml
index dbba8676b3..d10fd9c5ae 100644
--- a/deliverables/pike/designate-dashboard.yaml
+++ b/deliverables/pike/designate-dashboard.yaml
@@ -29,3 +29,5 @@ releases:
 branches:
   - location: 5.0.0.0rc1
     name: stable/pike
+repository-settings:
+  openstack/designate-dashboard: {}
diff --git a/deliverables/pike/designate.yaml b/deliverables/pike/designate.yaml
index 671a817a19..a13532c281 100644
--- a/deliverables/pike/designate.yaml
+++ b/deliverables/pike/designate.yaml
@@ -31,3 +31,5 @@ branches:
   - location: 5.0.0.0rc1
     name: stable/pike
 release-notes: https://docs.openstack.org/releasenotes/designate/pike.html
+repository-settings:
+  openstack/designate: {}
diff --git a/deliverables/pike/devstack.yaml b/deliverables/pike/devstack.yaml
index a8f0c40812..2690aa6878 100644
--- a/deliverables/pike/devstack.yaml
+++ b/deliverables/pike/devstack.yaml
@@ -1,10 +1,12 @@
 ---
 launchpad: devstack
 release-model: untagged
-team: Quality Assurance
+team: 'Quality Assurance'
 type: other
 stable-branch-type: tagless
 branches:
   - location:
       openstack-dev/devstack: 98ab7d9646730f02983380648831aa2682abcc0c
     name: stable/pike
+repository-settings:
+  openstack-dev/devstack: {}
diff --git a/deliverables/pike/django_openstack_auth.yaml b/deliverables/pike/django_openstack_auth.yaml
index ec18254c86..540b8f64e5 100644
--- a/deliverables/pike/django_openstack_auth.yaml
+++ b/deliverables/pike/django_openstack_auth.yaml
@@ -1,5 +1,5 @@
 ---
-include-pypi-link: true
+include-pypi-link: yes
 launchpad: django-openstack-auth
 release-model: cycle-with-intermediary
 team: horizon
@@ -9,30 +9,28 @@ releases:
     projects:
       - repo: openstack/django_openstack_auth
         hash: 525b76dc323db4c4e081eb5d42def6db14a84de9
-    highlights: >
-      This release inproves translation support, and raises the maximum Django
-      version
+    highlights: |
+      This release inproves translation support, and raises the maximum Django version
   - version: 3.3.0
     projects:
       - repo: openstack/django_openstack_auth
         hash: c15dfe5acd58efa0c5c27dd19de5d4ef2a880c36
-    highlights: >
-      This release improves translation support, raises the maximum Django
-      version, and adds support for a configurable domain dropdown on login.
+    highlights: |
+      This release improves translation support, raises the maximum Django version, and adds support for a configurable domain dropdown on login.
   - version: 3.4.0
     projects:
       - repo: openstack/django_openstack_auth
         hash: fb76589a26288a7d7966cee1702e414919706790
-    highlights: >
-      This release includes support for Django 1.11, as well as the usual
-      bug fix and translation improvements.
+    highlights: |
+      This release includes support for Django 1.11, as well as the usual bug fix and translation improvements.
   - version: 3.5.0
     projects:
       - repo: openstack/django_openstack_auth
         hash: 2ca726c68e92b6aaec0e7b0d6a425063972b870b
-    highlights: >
-      This release increases requirements to allow Django 1.11, and adds
-      support for a DEFAULT_SERVICE_REGIONS setting.
+    highlights: |
+      This release increases requirements to allow Django 1.11, and adds support for a DEFAULT_SERVICE_REGIONS setting.
 branches:
   - name: stable/pike
     location: 3.5.0
+repository-settings:
+  openstack/django_openstack_auth: {}
diff --git a/deliverables/pike/freezer-web-ui.yaml b/deliverables/pike/freezer-web-ui.yaml
index d8e81a6b03..7fe6d61c74 100644
--- a/deliverables/pike/freezer-web-ui.yaml
+++ b/deliverables/pike/freezer-web-ui.yaml
@@ -28,3 +28,5 @@ releases:
 branches:
   - location: 5.0.0.0rc1
     name: stable/pike
+repository-settings:
+  openstack/freezer-web-ui: {}
diff --git a/deliverables/pike/freezer.yaml b/deliverables/pike/freezer.yaml
index c475a606fe..fda413876d 100644
--- a/deliverables/pike/freezer.yaml
+++ b/deliverables/pike/freezer.yaml
@@ -49,3 +49,7 @@ branches:
   - location: 5.0.0.0rc1
     name: stable/pike
 release-notes: https://docs.openstack.org/releasenotes/freezer/pike.html
+repository-settings:
+  openstack/freezer: {}
+  openstack/freezer-api: {}
+  openstack/freezer-dr: {}
diff --git a/deliverables/pike/futurist.yaml b/deliverables/pike/futurist.yaml
index 9bef4720ed..65c3198034 100644
--- a/deliverables/pike/futurist.yaml
+++ b/deliverables/pike/futurist.yaml
@@ -38,3 +38,5 @@ releases:
     version: 1.3.1
 team: oslo
 type: library
+repository-settings:
+  openstack/futurist: {}
diff --git a/deliverables/pike/fuxi.yaml b/deliverables/pike/fuxi.yaml
index 629881b5be..2525283560 100644
--- a/deliverables/pike/fuxi.yaml
+++ b/deliverables/pike/fuxi.yaml
@@ -12,3 +12,5 @@ releases:
       - repo: openstack/fuxi
         hash: 53d7c9ff8bfa95121abfca193ab138df6aa50ad2
 release-notes: https://docs.openstack.org/releasenotes/fuxi/pike.html
+repository-settings:
+  openstack/fuxi: {}
diff --git a/deliverables/pike/glance-store.yaml b/deliverables/pike/glance-store.yaml
index 704842504e..06874fb75a 100644
--- a/deliverables/pike/glance-store.yaml
+++ b/deliverables/pike/glance-store.yaml
@@ -1,5 +1,5 @@
 ---
-include-pypi-link: true
+include-pypi-link: yes
 launchpad: glance-store
 release-model: cycle-with-intermediary
 team: glance
@@ -16,3 +16,5 @@ releases:
 branches:
   - name: stable/pike
     location: 0.21.0
+repository-settings:
+  openstack/glance_store: {}
diff --git a/deliverables/pike/glance.yaml b/deliverables/pike/glance.yaml
index 1476ca90d4..b3007c7c21 100644
--- a/deliverables/pike/glance.yaml
+++ b/deliverables/pike/glance.yaml
@@ -35,3 +35,5 @@ releases:
       - repo: openstack/glance
         hash: 982016670fe908e5d7026714b115e63b7c31b46b
     version: 15.0.0
+repository-settings:
+  openstack/glance: {}
diff --git a/deliverables/pike/grenade.yaml b/deliverables/pike/grenade.yaml
index c3cfe16cd0..6799a9c431 100644
--- a/deliverables/pike/grenade.yaml
+++ b/deliverables/pike/grenade.yaml
@@ -1,10 +1,12 @@
 ---
 launchpad: grenade
 release-model: untagged
-team: Quality Assurance
+team: 'Quality Assurance'
 type: other
 stable-branch-type: tagless
 branches:
   - location:
       openstack-dev/grenade: 1e3a981a6cf6216daa60fcd7583ad6e9cb1cefcc
     name: stable/pike
+repository-settings:
+  openstack-dev/grenade: {}
diff --git a/deliverables/pike/heat-agents.yaml b/deliverables/pike/heat-agents.yaml
index f9876b1982..a968ea69c9 100644
--- a/deliverables/pike/heat-agents.yaml
+++ b/deliverables/pike/heat-agents.yaml
@@ -23,3 +23,5 @@ releases:
 branches:
   - name: stable/pike
     location: 1.4.0
+repository-settings:
+  openstack/heat-agents: {}
diff --git a/deliverables/pike/heat-translator.yaml b/deliverables/pike/heat-translator.yaml
index 7c82a29f70..ff743960dd 100644
--- a/deliverables/pike/heat-translator.yaml
+++ b/deliverables/pike/heat-translator.yaml
@@ -16,3 +16,5 @@ releases:
 branches:
   - name: stable/pike
     location: 0.9.0
+repository-settings:
+  openstack/heat-translator: {}
diff --git a/deliverables/pike/heat.yaml b/deliverables/pike/heat.yaml
index 5baa0e7068..8afe6bfae1 100644
--- a/deliverables/pike/heat.yaml
+++ b/deliverables/pike/heat.yaml
@@ -41,3 +41,5 @@ releases:
     projects:
       - repo: openstack/heat
         hash: ed3eb9fe823e193e850e170405eecbc1411667f6
+repository-settings:
+  openstack/heat: {}
diff --git a/deliverables/pike/horizon.yaml b/deliverables/pike/horizon.yaml
index 9bbcdc5718..7006be7ebf 100644
--- a/deliverables/pike/horizon.yaml
+++ b/deliverables/pike/horizon.yaml
@@ -45,3 +45,5 @@ branches:
   - location: 12.0.0.0rc1
     name: stable/pike
 release-notes: https://docs.openstack.org/releasenotes/horizon/pike.html
+repository-settings:
+  openstack/horizon: {}
diff --git a/deliverables/pike/instack-undercloud.yaml b/deliverables/pike/instack-undercloud.yaml
index a7fc0a5143..ee63d4f765 100644
--- a/deliverables/pike/instack-undercloud.yaml
+++ b/deliverables/pike/instack-undercloud.yaml
@@ -65,3 +65,5 @@ releases:
 team: tripleo
 type: other
 release-notes: https://docs.openstack.org/releasenotes/instack-undercloud/pike.html
+repository-settings:
+  openstack/instack-undercloud: {}
diff --git a/deliverables/pike/instack.yaml b/deliverables/pike/instack.yaml
index d5027f08a2..11a9e8dcdc 100644
--- a/deliverables/pike/instack.yaml
+++ b/deliverables/pike/instack.yaml
@@ -20,3 +20,5 @@ type: library
 branches:
   - name: stable/pike
     location: 7.0.0
+repository-settings:
+  openstack/instack: {}
diff --git a/deliverables/pike/ironic-inspector.yaml b/deliverables/pike/ironic-inspector.yaml
index d8f9b00d75..3e0c344ff5 100644
--- a/deliverables/pike/ironic-inspector.yaml
+++ b/deliverables/pike/ironic-inspector.yaml
@@ -16,3 +16,5 @@ releases:
 branches:
   - location: 6.0.0
     name: stable/pike
+repository-settings:
+  openstack/ironic-inspector: {}
diff --git a/deliverables/pike/ironic-lib.yaml b/deliverables/pike/ironic-lib.yaml
index 6deb1b4c57..f608b712db 100644
--- a/deliverables/pike/ironic-lib.yaml
+++ b/deliverables/pike/ironic-lib.yaml
@@ -28,3 +28,5 @@ releases:
 branches:
   - name: stable/pike
     location: 2.9.0
+repository-settings:
+  openstack/ironic-lib: {}
diff --git a/deliverables/pike/ironic-python-agent.yaml b/deliverables/pike/ironic-python-agent.yaml
index 14394f197c..43394b37d4 100644
--- a/deliverables/pike/ironic-python-agent.yaml
+++ b/deliverables/pike/ironic-python-agent.yaml
@@ -30,3 +30,5 @@ branches:
   - location: 2.2.0
     name: stable/pike
 release-notes: https://docs.openstack.org/releasenotes/ironic-python-agent/pike.html
+repository-settings:
+  openstack/ironic-python-agent: {}
diff --git a/deliverables/pike/ironic-ui.yaml b/deliverables/pike/ironic-ui.yaml
index 65d728a515..20ab0097fd 100644
--- a/deliverables/pike/ironic-ui.yaml
+++ b/deliverables/pike/ironic-ui.yaml
@@ -21,3 +21,5 @@ releases:
 branches:
   - name: stable/pike
     location: 3.0.0
+repository-settings:
+  openstack/ironic-ui: {}
diff --git a/deliverables/pike/ironic.yaml b/deliverables/pike/ironic.yaml
index 71fa526968..a780736eba 100644
--- a/deliverables/pike/ironic.yaml
+++ b/deliverables/pike/ironic.yaml
@@ -32,3 +32,5 @@ releases:
       - hash: cf3665fe1c60d43aa39f1880e427875c9c571058
         repo: openstack/ironic
     version: 9.1.2
+repository-settings:
+  openstack/ironic: {}
diff --git a/deliverables/pike/karbor-dashboard.yaml b/deliverables/pike/karbor-dashboard.yaml
index 9ffeffa36d..da3e426fcd 100644
--- a/deliverables/pike/karbor-dashboard.yaml
+++ b/deliverables/pike/karbor-dashboard.yaml
@@ -15,3 +15,5 @@ releases:
 branches:
   - location: 0.4.0
     name: stable/pike
+repository-settings:
+  openstack/karbor-dashboard: {}
diff --git a/deliverables/pike/karbor.yaml b/deliverables/pike/karbor.yaml
index be4ca77197..86263f83e1 100644
--- a/deliverables/pike/karbor.yaml
+++ b/deliverables/pike/karbor.yaml
@@ -20,8 +20,8 @@ releases:
     projects:
       - repo: openstack/karbor
         hash: 78d1bed0429ebbfee86fb3422e43a65ae98c9fc9
-
-
 branches:
   - location: 0.5.0
     name: stable/pike
+repository-settings:
+  openstack/karbor: {}
diff --git a/deliverables/pike/keystone.yaml b/deliverables/pike/keystone.yaml
index d00d06eb45..06f9705cd5 100644
--- a/deliverables/pike/keystone.yaml
+++ b/deliverables/pike/keystone.yaml
@@ -33,3 +33,5 @@ branches:
   - location: 12.0.0.0rc1
     name: stable/pike
 release-notes: https://docs.openstack.org/releasenotes/keystone/pike.html
+repository-settings:
+  openstack/keystone: {}
diff --git a/deliverables/pike/keystoneauth.yaml b/deliverables/pike/keystoneauth.yaml
index cf6dc9ada5..c26e8c71fe 100644
--- a/deliverables/pike/keystoneauth.yaml
+++ b/deliverables/pike/keystoneauth.yaml
@@ -39,3 +39,5 @@ releases:
     version: 3.1.0
 team: keystone
 type: library
+repository-settings:
+  openstack/keystoneauth: {}
diff --git a/deliverables/pike/keystonemiddleware.yaml b/deliverables/pike/keystonemiddleware.yaml
index 61baf48b00..7b660fd0bf 100644
--- a/deliverables/pike/keystonemiddleware.yaml
+++ b/deliverables/pike/keystonemiddleware.yaml
@@ -21,3 +21,5 @@ releases:
     version: 4.17.0
 team: keystone
 type: library
+repository-settings:
+  openstack/keystonemiddleware: {}
diff --git a/deliverables/pike/kolla-ansible.yaml b/deliverables/pike/kolla-ansible.yaml
index 851b468199..ba83f82be4 100644
--- a/deliverables/pike/kolla-ansible.yaml
+++ b/deliverables/pike/kolla-ansible.yaml
@@ -33,3 +33,5 @@ releases:
       - repo: openstack/kolla-ansible
         hash: a097d59a5ec5b637eb4a61307e58a5e04f3cb43e
 release-notes: https://docs.openstack.org/releasenotes/kolla-ansible/pike.html
+repository-settings:
+  openstack/kolla-ansible: {}
diff --git a/deliverables/pike/kolla.yaml b/deliverables/pike/kolla.yaml
index 698911cc64..8f0fa8b84e 100644
--- a/deliverables/pike/kolla.yaml
+++ b/deliverables/pike/kolla.yaml
@@ -33,3 +33,5 @@ releases:
       - repo: openstack/kolla
         hash: 5bae59ba945d20b1a75b086379d1f40f08b44196
 release-notes: https://docs.openstack.org/releasenotes/kolla/pike.html
+repository-settings:
+  openstack/kolla: {}
diff --git a/deliverables/pike/kuryr-kubernetes.yaml b/deliverables/pike/kuryr-kubernetes.yaml
index 0dd01641d3..51d4ebe9ac 100644
--- a/deliverables/pike/kuryr-kubernetes.yaml
+++ b/deliverables/pike/kuryr-kubernetes.yaml
@@ -15,3 +15,5 @@ releases:
     projects:
       - repo: openstack/kuryr-kubernetes
         hash: a2828664eb5f85f3d7effc7f0006066c17578d61
+repository-settings:
+  openstack/kuryr-kubernetes: {}
diff --git a/deliverables/pike/ldappool.yaml b/deliverables/pike/ldappool.yaml
index 6f9e993462..ed1284cde7 100644
--- a/deliverables/pike/ldappool.yaml
+++ b/deliverables/pike/ldappool.yaml
@@ -11,3 +11,5 @@ releases:
 branches:
   - name: stable/pike
     location: 2.1.0
+repository-settings:
+  openstack/ldappool: {}
diff --git a/deliverables/pike/magnum-ui.yaml b/deliverables/pike/magnum-ui.yaml
index 56ff11e0c0..d4606aef4c 100644
--- a/deliverables/pike/magnum-ui.yaml
+++ b/deliverables/pike/magnum-ui.yaml
@@ -12,3 +12,5 @@ releases:
         repo: openstack/magnum-ui
     version: 3.0.0
 release-notes: https://docs.openstack.org/releasenotes/magnum-ui/pike.html
+repository-settings:
+  openstack/magnum-ui: {}
diff --git a/deliverables/pike/magnum.yaml b/deliverables/pike/magnum.yaml
index b5d9339051..73e75289de 100644
--- a/deliverables/pike/magnum.yaml
+++ b/deliverables/pike/magnum.yaml
@@ -16,3 +16,5 @@ releases:
       - hash: fed947d4000119866e66c3dd77463aa8823efb29
         repo: openstack/magnum
     version: 5.0.1
+repository-settings:
+  openstack/magnum: {}
diff --git a/deliverables/pike/manila-ui.yaml b/deliverables/pike/manila-ui.yaml
index a25a1e90a5..29d83480ef 100644
--- a/deliverables/pike/manila-ui.yaml
+++ b/deliverables/pike/manila-ui.yaml
@@ -28,3 +28,5 @@ releases:
 branches:
   - location: 2.10.1
     name: stable/pike
+repository-settings:
+  openstack/manila-ui: {}
diff --git a/deliverables/pike/manila.yaml b/deliverables/pike/manila.yaml
index ed37fe01ac..d8a978d9aa 100644
--- a/deliverables/pike/manila.yaml
+++ b/deliverables/pike/manila.yaml
@@ -33,3 +33,5 @@ branches:
   - location: 5.0.0.0rc1
     name: stable/pike
 release-notes: https://docs.openstack.org/releasenotes/manila/pike.html
+repository-settings:
+  openstack/manila: {}
diff --git a/deliverables/pike/mistral-lib.yaml b/deliverables/pike/mistral-lib.yaml
index 0b4dccff09..b4eb6b890e 100644
--- a/deliverables/pike/mistral-lib.yaml
+++ b/deliverables/pike/mistral-lib.yaml
@@ -1,5 +1,5 @@
 ---
-include-pypi-link: true
+include-pypi-link: yes
 launchpad: mistral
 release-model: cycle-with-intermediary
 team: mistral
@@ -32,3 +32,5 @@ releases:
 branches:
   - name: stable/pike
     location: 0.3.0
+repository-settings:
+  openstack/mistral-lib: {}
diff --git a/deliverables/pike/mistral.yaml b/deliverables/pike/mistral.yaml
index 4d11209ad0..14d0e981db 100644
--- a/deliverables/pike/mistral.yaml
+++ b/deliverables/pike/mistral.yaml
@@ -67,3 +67,7 @@ branches:
   - location: 5.0.0.0rc1
     name: stable/pike
 release-notes: https://docs.openstack.org/releasenotes/mistral/pike.html
+repository-settings:
+  openstack/mistral: {}
+  openstack/mistral-dashboard: {}
+  openstack/mistral-extra: {}
diff --git a/deliverables/pike/monasca-agent.yaml b/deliverables/pike/monasca-agent.yaml
index 75b800fb94..2e116f0f72 100644
--- a/deliverables/pike/monasca-agent.yaml
+++ b/deliverables/pike/monasca-agent.yaml
@@ -27,3 +27,5 @@ releases:
 branches:
   - location: 2.2.0
     name: stable/pike
+repository-settings:
+  openstack/monasca-agent: {}
diff --git a/deliverables/pike/monasca-api.yaml b/deliverables/pike/monasca-api.yaml
index a3fd6e13b5..81f26112d1 100644
--- a/deliverables/pike/monasca-api.yaml
+++ b/deliverables/pike/monasca-api.yaml
@@ -20,3 +20,5 @@ branches:
   - location: 2.2.0
     name: stable/pike
 release-notes: https://docs.openstack.org/releasenotes/monasca-api/pike.html
+repository-settings:
+  openstack/monasca-api: {}
diff --git a/deliverables/pike/monasca-ceilometer.yaml b/deliverables/pike/monasca-ceilometer.yaml
index be73bacf0b..1a8138e48a 100644
--- a/deliverables/pike/monasca-ceilometer.yaml
+++ b/deliverables/pike/monasca-ceilometer.yaml
@@ -20,3 +20,5 @@ releases:
 branches:
   - location: 1.5.0
     name: stable/pike
+repository-settings:
+  openstack/monasca-ceilometer: {}
diff --git a/deliverables/pike/monasca-common.yaml b/deliverables/pike/monasca-common.yaml
index c5afcf480e..6a179b7639 100644
--- a/deliverables/pike/monasca-common.yaml
+++ b/deliverables/pike/monasca-common.yaml
@@ -23,3 +23,5 @@ releases:
 branches:
   - location: 2.3.0
     name: stable/pike
+repository-settings:
+  openstack/monasca-common: {}
diff --git a/deliverables/pike/monasca-kibana-plugin.yaml b/deliverables/pike/monasca-kibana-plugin.yaml
index 748b39b961..1f19d02fdb 100644
--- a/deliverables/pike/monasca-kibana-plugin.yaml
+++ b/deliverables/pike/monasca-kibana-plugin.yaml
@@ -19,3 +19,5 @@ releases:
 branches:
   - location: 1.1.2
     name: stable/pike
+repository-settings:
+  openstack/monasca-kibana-plugin: {}
diff --git a/deliverables/pike/monasca-log-api.yaml b/deliverables/pike/monasca-log-api.yaml
index d1406cfffc..9a2ae8a9d4 100644
--- a/deliverables/pike/monasca-log-api.yaml
+++ b/deliverables/pike/monasca-log-api.yaml
@@ -28,3 +28,5 @@ branches:
   - location: 2.3.0
     name: stable/pike
 release-notes: https://docs.openstack.org/releasenotes/monasca-log-api/pike.html
+repository-settings:
+  openstack/monasca-log-api: {}
diff --git a/deliverables/pike/monasca-notification.yaml b/deliverables/pike/monasca-notification.yaml
index 633d9de790..5e943c5ad1 100644
--- a/deliverables/pike/monasca-notification.yaml
+++ b/deliverables/pike/monasca-notification.yaml
@@ -23,3 +23,5 @@ releases:
 branches:
   - location: 1.10.0
     name: stable/pike
+repository-settings:
+  openstack/monasca-notification: {}
diff --git a/deliverables/pike/monasca-persister.yaml b/deliverables/pike/monasca-persister.yaml
index 61b3059de4..6267a79abc 100644
--- a/deliverables/pike/monasca-persister.yaml
+++ b/deliverables/pike/monasca-persister.yaml
@@ -19,3 +19,5 @@ releases:
 branches:
   - location: 1.7.0
     name: stable/pike
+repository-settings:
+  openstack/monasca-persister: {}
diff --git a/deliverables/pike/monasca-statsd.yaml b/deliverables/pike/monasca-statsd.yaml
index f4cfebc8dc..7b24e60ca5 100644
--- a/deliverables/pike/monasca-statsd.yaml
+++ b/deliverables/pike/monasca-statsd.yaml
@@ -15,3 +15,5 @@ releases:
 branches:
   - name: stable/pike
     location: 1.7.0
+repository-settings:
+  openstack/monasca-statsd: {}
diff --git a/deliverables/pike/monasca-thresh.yaml b/deliverables/pike/monasca-thresh.yaml
index 0b22b1de0c..9181bafe92 100644
--- a/deliverables/pike/monasca-thresh.yaml
+++ b/deliverables/pike/monasca-thresh.yaml
@@ -12,3 +12,5 @@ releases:
 branches:
   - location: 1.4.0
     name: stable/pike
+repository-settings:
+  openstack/monasca-thresh: {}
diff --git a/deliverables/pike/monasca-transform.yaml b/deliverables/pike/monasca-transform.yaml
index 17dde86976..199e78fd7a 100644
--- a/deliverables/pike/monasca-transform.yaml
+++ b/deliverables/pike/monasca-transform.yaml
@@ -16,3 +16,5 @@ releases:
 branches:
   - location: 0.11.0
     name: stable/pike
+repository-settings:
+  openstack/monasca-transform: {}
diff --git a/deliverables/pike/monasca-ui.yaml b/deliverables/pike/monasca-ui.yaml
index 64c0e202a6..e919429d97 100644
--- a/deliverables/pike/monasca-ui.yaml
+++ b/deliverables/pike/monasca-ui.yaml
@@ -23,3 +23,5 @@ releases:
 branches:
   - location: 1.8.0
     name: stable/pike
+repository-settings:
+  openstack/monasca-ui: {}
diff --git a/deliverables/pike/mox3.yaml b/deliverables/pike/mox3.yaml
index 3db52ece4d..ecd3203034 100644
--- a/deliverables/pike/mox3.yaml
+++ b/deliverables/pike/mox3.yaml
@@ -20,3 +20,5 @@ releases:
 branches:
   - name: stable/pike
     location: 0.23.0
+repository-settings:
+  openstack/mox3: {}
diff --git a/deliverables/pike/murano-agent.yaml b/deliverables/pike/murano-agent.yaml
index ea562e67aa..9679586d3e 100644
--- a/deliverables/pike/murano-agent.yaml
+++ b/deliverables/pike/murano-agent.yaml
@@ -12,3 +12,5 @@ releases:
       - repo: openstack/murano-agent
         hash: 0430611c60cc21d8e93e0ac439cee39af8f13cae
 release-notes: https://docs.openstack.org/releasenotes/murano-agent/pike.html
+repository-settings:
+  openstack/murano-agent: {}
diff --git a/deliverables/pike/murano-dashboard.yaml b/deliverables/pike/murano-dashboard.yaml
index 801e8ef815..085edcfd24 100644
--- a/deliverables/pike/murano-dashboard.yaml
+++ b/deliverables/pike/murano-dashboard.yaml
@@ -33,3 +33,5 @@ branches:
   - location: 4.0.0.0rc1
     name: stable/pike
 release-notes: https://docs.openstack.org/releasenotes/murano-dashboard/pike.html
+repository-settings:
+  openstack/murano-dashboard: {}
diff --git a/deliverables/pike/murano.yaml b/deliverables/pike/murano.yaml
index 977be14e14..f4eb31542b 100644
--- a/deliverables/pike/murano.yaml
+++ b/deliverables/pike/murano.yaml
@@ -33,3 +33,5 @@ branches:
   - location: 4.0.0.0rc1
     name: stable/pike
 release-notes: https://docs.openstack.org/releasenotes/murano/pike.html
+repository-settings:
+  openstack/murano: {}
diff --git a/deliverables/pike/networking-bagpipe.yaml b/deliverables/pike/networking-bagpipe.yaml
index e38b975d35..6b9a9d63fe 100644
--- a/deliverables/pike/networking-bagpipe.yaml
+++ b/deliverables/pike/networking-bagpipe.yaml
@@ -34,3 +34,5 @@ releases:
 branches:
   - location: 7.0.0.0rc1
     name: stable/pike
+repository-settings:
+  openstack/networking-bagpipe: {}
diff --git a/deliverables/pike/networking-baremetal.yaml b/deliverables/pike/networking-baremetal.yaml
index 6047718049..e6aa91445b 100644
--- a/deliverables/pike/networking-baremetal.yaml
+++ b/deliverables/pike/networking-baremetal.yaml
@@ -17,3 +17,5 @@ branches:
   - location: 0.1.0
     name: stable/pike
 release-notes: https://docs.openstack.org/releasenotes/networking-baremetal/pike.html
+repository-settings:
+  openstack/networking-baremetal: {}
diff --git a/deliverables/pike/networking-bgpvpn.yaml b/deliverables/pike/networking-bgpvpn.yaml
index c0f203b028..5b2ace59fc 100644
--- a/deliverables/pike/networking-bgpvpn.yaml
+++ b/deliverables/pike/networking-bgpvpn.yaml
@@ -34,3 +34,5 @@ releases:
 branches:
   - location: 7.0.0.0rc1
     name: stable/pike
+repository-settings:
+  openstack/networking-bgpvpn: {}
diff --git a/deliverables/pike/networking-hyperv.yaml b/deliverables/pike/networking-hyperv.yaml
index 382606b8b3..85974cd345 100644
--- a/deliverables/pike/networking-hyperv.yaml
+++ b/deliverables/pike/networking-hyperv.yaml
@@ -13,3 +13,5 @@ releases:
       - repo: openstack/networking-hyperv
         hash: 400c817c337d6571e47af77ae2f33961fb69e75c
 release-notes: https://docs.openstack.org/releasenotes/networking-hyperv/pike.html
+repository-settings:
+  openstack/networking-hyperv: {}
diff --git a/deliverables/pike/networking-midonet.yaml b/deliverables/pike/networking-midonet.yaml
index bba080f114..9c4554a639 100644
--- a/deliverables/pike/networking-midonet.yaml
+++ b/deliverables/pike/networking-midonet.yaml
@@ -34,3 +34,5 @@ releases:
 branches:
   - location: 5.0.0.0rc1
     name: stable/pike
+repository-settings:
+  openstack/networking-midonet: {}
diff --git a/deliverables/pike/networking-odl.yaml b/deliverables/pike/networking-odl.yaml
index 42b2b251b8..13b676b7e2 100644
--- a/deliverables/pike/networking-odl.yaml
+++ b/deliverables/pike/networking-odl.yaml
@@ -34,3 +34,5 @@ releases:
 branches:
   - location: 11.0.0.0rc1
     name: stable/pike
+repository-settings:
+  openstack/networking-odl: {}
diff --git a/deliverables/pike/networking-ovn.yaml b/deliverables/pike/networking-ovn.yaml
index 166dca742d..8c9d7d4810 100644
--- a/deliverables/pike/networking-ovn.yaml
+++ b/deliverables/pike/networking-ovn.yaml
@@ -35,3 +35,5 @@ releases:
 branches:
   - location: 3.0.0.0rc1
     name: stable/pike
+repository-settings:
+  openstack/networking-ovn: {}
diff --git a/deliverables/pike/networking-sfc.yaml b/deliverables/pike/networking-sfc.yaml
index 893d038c0d..bf4de865ae 100644
--- a/deliverables/pike/networking-sfc.yaml
+++ b/deliverables/pike/networking-sfc.yaml
@@ -34,3 +34,5 @@ releases:
 branches:
   - location: 5.0.0.0rc1
     name: stable/pike
+repository-settings:
+  openstack/networking-sfc: {}
diff --git a/deliverables/pike/neutron-dynamic-routing.yaml b/deliverables/pike/neutron-dynamic-routing.yaml
index a48299dacb..dd12b7ba60 100644
--- a/deliverables/pike/neutron-dynamic-routing.yaml
+++ b/deliverables/pike/neutron-dynamic-routing.yaml
@@ -33,3 +33,5 @@ releases:
 branches:
   - location: 11.0.0.0rc1
     name: stable/pike
+repository-settings:
+  openstack/neutron-dynamic-routing: {}
diff --git a/deliverables/pike/neutron-fwaas-dashboard.yaml b/deliverables/pike/neutron-fwaas-dashboard.yaml
index 7cbc88ed7d..b444ebb58a 100644
--- a/deliverables/pike/neutron-fwaas-dashboard.yaml
+++ b/deliverables/pike/neutron-fwaas-dashboard.yaml
@@ -17,3 +17,5 @@ releases:
 branches:
   - location: 1.0.0
     name: stable/pike
+repository-settings:
+  openstack/neutron-fwaas-dashboard: {}
diff --git a/deliverables/pike/neutron-fwaas.yaml b/deliverables/pike/neutron-fwaas.yaml
index af46aeb14b..d689064374 100644
--- a/deliverables/pike/neutron-fwaas.yaml
+++ b/deliverables/pike/neutron-fwaas.yaml
@@ -40,3 +40,5 @@ releases:
 branches:
   - location: 11.0.0.0rc1
     name: stable/pike
+repository-settings:
+  openstack/neutron-fwaas: {}
diff --git a/deliverables/pike/neutron-lbaas-dashboard.yaml b/deliverables/pike/neutron-lbaas-dashboard.yaml
index b7be8dfdeb..02e741607a 100644
--- a/deliverables/pike/neutron-lbaas-dashboard.yaml
+++ b/deliverables/pike/neutron-lbaas-dashboard.yaml
@@ -44,3 +44,5 @@ releases:
 branches:
   - location: 3.0.0.0rc1
     name: stable/pike
+repository-settings:
+  openstack/neutron-lbaas-dashboard: {}
diff --git a/deliverables/pike/neutron-lbaas.yaml b/deliverables/pike/neutron-lbaas.yaml
index e1799e6a3e..55ae0f05b7 100644
--- a/deliverables/pike/neutron-lbaas.yaml
+++ b/deliverables/pike/neutron-lbaas.yaml
@@ -39,3 +39,5 @@ branches:
   - location: 11.0.0.0rc1
     name: stable/pike
 release-notes: https://docs.openstack.org/releasenotes/neutron-lbaas/pike.html
+repository-settings:
+  openstack/neutron-lbaas: {}
diff --git a/deliverables/pike/neutron-lib.yaml b/deliverables/pike/neutron-lib.yaml
index 0e99b10cbb..02261d869a 100644
--- a/deliverables/pike/neutron-lib.yaml
+++ b/deliverables/pike/neutron-lib.yaml
@@ -96,3 +96,5 @@ releases:
 branches:
   - name: stable/pike
     location: 1.9.1
+repository-settings:
+  openstack/neutron-lib: {}
diff --git a/deliverables/pike/neutron.yaml b/deliverables/pike/neutron.yaml
index e4482b993b..6c98f90ee9 100644
--- a/deliverables/pike/neutron.yaml
+++ b/deliverables/pike/neutron.yaml
@@ -54,3 +54,5 @@ releases:
 branches:
   - location: 11.0.0.0rc1
     name: stable/pike
+repository-settings:
+  openstack/neutron: {}
diff --git a/deliverables/pike/nova.yaml b/deliverables/pike/nova.yaml
index 2356ff9732..49852c5fbc 100644
--- a/deliverables/pike/nova.yaml
+++ b/deliverables/pike/nova.yaml
@@ -54,3 +54,5 @@ releases:
     projects:
       - repo: openstack/nova
         hash: 4d4930c59af32d717088b3af28047ee1fcf09d4a
+repository-settings:
+  openstack/nova: {}
diff --git a/deliverables/pike/octavia.yaml b/deliverables/pike/octavia.yaml
index 8a02fb5235..d2fdb16bf2 100644
--- a/deliverables/pike/octavia.yaml
+++ b/deliverables/pike/octavia.yaml
@@ -57,3 +57,5 @@ branches:
   - location: 1.0.0.0rc1
     name: stable/pike
 release-notes: https://docs.openstack.org/releasenotes/octavia/pike.html
+repository-settings:
+  openstack/octavia: {}
diff --git a/deliverables/pike/openstack-ansible.yaml b/deliverables/pike/openstack-ansible.yaml
index fb3f831b1a..3095aabcaf 100644
--- a/deliverables/pike/openstack-ansible.yaml
+++ b/deliverables/pike/openstack-ansible.yaml
@@ -1072,3 +1072,45 @@ releases:
         hash: f41638370114412b97c6523b4c626ca70f0337f4
       - repo: openstack/openstack-ansible-rsyslog_server
         hash: 61a3ab251f63c6156f2a6604ee1a822070e19c90
+repository-settings:
+  openstack/ansible-hardening: {}
+  openstack/openstack-ansible: {}
+  openstack/openstack-ansible-apt_package_pinning: {}
+  openstack/openstack-ansible-ceph_client: {}
+  openstack/openstack-ansible-galera_client: {}
+  openstack/openstack-ansible-galera_server: {}
+  openstack/openstack-ansible-haproxy_server: {}
+  openstack/openstack-ansible-lxc_container_create: {}
+  openstack/openstack-ansible-lxc_hosts: {}
+  openstack/openstack-ansible-memcached_server: {}
+  openstack/openstack-ansible-openstack_hosts: {}
+  openstack/openstack-ansible-openstack_openrc: {}
+  openstack/openstack-ansible-os_aodh: {}
+  openstack/openstack-ansible-os_barbican: {}
+  openstack/openstack-ansible-os_ceilometer: {}
+  openstack/openstack-ansible-os_cinder: {}
+  openstack/openstack-ansible-os_designate: {}
+  openstack/openstack-ansible-os_glance: {}
+  openstack/openstack-ansible-os_gnocchi: {}
+  openstack/openstack-ansible-os_heat: {}
+  openstack/openstack-ansible-os_horizon: {}
+  openstack/openstack-ansible-os_ironic: {}
+  openstack/openstack-ansible-os_keystone: {}
+  openstack/openstack-ansible-os_magnum: {}
+  openstack/openstack-ansible-os_molteniron: {}
+  openstack/openstack-ansible-os_neutron: {}
+  openstack/openstack-ansible-os_nova: {}
+  openstack/openstack-ansible-os_octavia: {}
+  openstack/openstack-ansible-os_rally: {}
+  openstack/openstack-ansible-os_sahara: {}
+  openstack/openstack-ansible-os_swift: {}
+  openstack/openstack-ansible-os_tempest: {}
+  openstack/openstack-ansible-os_trove: {}
+  openstack/openstack-ansible-pip_install: {}
+  openstack/openstack-ansible-plugins: {}
+  openstack/openstack-ansible-rabbitmq_server: {}
+  openstack/openstack-ansible-repo_build: {}
+  openstack/openstack-ansible-repo_server: {}
+  openstack/openstack-ansible-rsyslog_client: {}
+  openstack/openstack-ansible-rsyslog_server: {}
+  openstack/openstack-ansible-security: {}
diff --git a/deliverables/pike/os-apply-config.yaml b/deliverables/pike/os-apply-config.yaml
index 5ba4d5670e..4c17912da5 100644
--- a/deliverables/pike/os-apply-config.yaml
+++ b/deliverables/pike/os-apply-config.yaml
@@ -32,3 +32,5 @@ releases:
     version: 7.2.2
 team: tripleo
 type: other
+repository-settings:
+  openstack/os-apply-config: {}
diff --git a/deliverables/pike/os-brick.yaml b/deliverables/pike/os-brick.yaml
index b87757bfc1..f7f95c4528 100644
--- a/deliverables/pike/os-brick.yaml
+++ b/deliverables/pike/os-brick.yaml
@@ -49,3 +49,5 @@ releases:
     version: 1.15.5
 team: cinder
 type: library
+repository-settings:
+  openstack/os-brick: {}
diff --git a/deliverables/pike/os-client-config.yaml b/deliverables/pike/os-client-config.yaml
index 23926ff4d8..bda8f50a6b 100644
--- a/deliverables/pike/os-client-config.yaml
+++ b/deliverables/pike/os-client-config.yaml
@@ -19,3 +19,5 @@ releases:
     version: 1.28.0
 team: OpenStackClient
 type: library
+repository-settings:
+  openstack/os-client-config: {}
diff --git a/deliverables/pike/os-collect-config.yaml b/deliverables/pike/os-collect-config.yaml
index ebe960a34e..f651414fa3 100644
--- a/deliverables/pike/os-collect-config.yaml
+++ b/deliverables/pike/os-collect-config.yaml
@@ -28,3 +28,5 @@ releases:
     version: 7.2.1
 team: tripleo
 type: other
+repository-settings:
+  openstack/os-collect-config: {}
diff --git a/deliverables/pike/os-net-config.yaml b/deliverables/pike/os-net-config.yaml
index 5d039c331c..995694db13 100644
--- a/deliverables/pike/os-net-config.yaml
+++ b/deliverables/pike/os-net-config.yaml
@@ -36,3 +36,5 @@ releases:
     version: 7.3.2
 team: tripleo
 type: other
+repository-settings:
+  openstack/os-net-config: {}
diff --git a/deliverables/pike/os-refresh-config.yaml b/deliverables/pike/os-refresh-config.yaml
index c3ccfd04e4..2b679f45e6 100644
--- a/deliverables/pike/os-refresh-config.yaml
+++ b/deliverables/pike/os-refresh-config.yaml
@@ -20,3 +20,5 @@ releases:
     version: 7.1.0
 team: tripleo
 type: other
+repository-settings:
+  openstack/os-refresh-config: {}
diff --git a/deliverables/pike/os-traits.yaml b/deliverables/pike/os-traits.yaml
index a709e729c0..bdb6d1f4db 100644
--- a/deliverables/pike/os-traits.yaml
+++ b/deliverables/pike/os-traits.yaml
@@ -33,3 +33,5 @@ releases:
 branches:
   - name: stable/pike
     location: 0.3.3
+repository-settings:
+  openstack/os-traits: {}
diff --git a/deliverables/pike/os-vif.yaml b/deliverables/pike/os-vif.yaml
index bcd001839a..c85ae5397b 100644
--- a/deliverables/pike/os-vif.yaml
+++ b/deliverables/pike/os-vif.yaml
@@ -28,3 +28,5 @@ releases:
 branches:
   - name: stable/pike
     location: 1.7.0
+repository-settings:
+  openstack/os-vif: {}
diff --git a/deliverables/pike/os-win.yaml b/deliverables/pike/os-win.yaml
index f7d579b0c1..82ffda7561 100644
--- a/deliverables/pike/os-win.yaml
+++ b/deliverables/pike/os-win.yaml
@@ -1,5 +1,5 @@
 ---
-include-pypi-link: true
+include-pypi-link: yes
 launchpad: os-win
 release-model: cycle-with-intermediary
 team: winstackers
@@ -37,3 +37,5 @@ releases:
 branches:
   - name: stable/pike
     location: 2.1.0
+repository-settings:
+  openstack/os-win: {}
diff --git a/deliverables/pike/osc-lib.yaml b/deliverables/pike/osc-lib.yaml
index 86b4addcdf..f3223b0fce 100644
--- a/deliverables/pike/osc-lib.yaml
+++ b/deliverables/pike/osc-lib.yaml
@@ -32,3 +32,5 @@ releases:
     version: 1.7.0
 team: OpenStackClient
 type: library
+repository-settings:
+  openstack/osc-lib: {}
diff --git a/deliverables/pike/oslo.cache.yaml b/deliverables/pike/oslo.cache.yaml
index cf9b994b6b..41a514afc8 100644
--- a/deliverables/pike/oslo.cache.yaml
+++ b/deliverables/pike/oslo.cache.yaml
@@ -45,3 +45,5 @@ releases:
     version: 1.25.1
 team: oslo
 type: library
+repository-settings:
+  openstack/oslo.cache: {}
diff --git a/deliverables/pike/oslo.concurrency.yaml b/deliverables/pike/oslo.concurrency.yaml
index d879355233..52af067910 100644
--- a/deliverables/pike/oslo.concurrency.yaml
+++ b/deliverables/pike/oslo.concurrency.yaml
@@ -25,3 +25,5 @@ releases:
     version: 3.21.1
 team: oslo
 type: library
+repository-settings:
+  openstack/oslo.concurrency: {}
diff --git a/deliverables/pike/oslo.config.yaml b/deliverables/pike/oslo.config.yaml
index 47ec6a436e..d558bd68b2 100644
--- a/deliverables/pike/oslo.config.yaml
+++ b/deliverables/pike/oslo.config.yaml
@@ -73,3 +73,5 @@ releases:
     version: 4.11.1
 team: oslo
 type: library
+repository-settings:
+  openstack/oslo.config: {}
diff --git a/deliverables/pike/oslo.context.yaml b/deliverables/pike/oslo.context.yaml
index 83dbac6281..aef8f00669 100644
--- a/deliverables/pike/oslo.context.yaml
+++ b/deliverables/pike/oslo.context.yaml
@@ -33,3 +33,5 @@ branches:
   - name: stable/pike
     location: 2.17.0
 release-notes: https://docs.openstack.org/releasenotes/oslo.context/pike.html
+repository-settings:
+  openstack/oslo.context: {}
diff --git a/deliverables/pike/oslo.db.yaml b/deliverables/pike/oslo.db.yaml
index 19e3eb0575..ef0e592079 100644
--- a/deliverables/pike/oslo.db.yaml
+++ b/deliverables/pike/oslo.db.yaml
@@ -53,3 +53,5 @@ releases:
     version: 4.25.1
 team: oslo
 type: library
+repository-settings:
+  openstack/oslo.db: {}
diff --git a/deliverables/pike/oslo.i18n.yaml b/deliverables/pike/oslo.i18n.yaml
index 136f989c5f..b373adef73 100644
--- a/deliverables/pike/oslo.i18n.yaml
+++ b/deliverables/pike/oslo.i18n.yaml
@@ -45,3 +45,5 @@ releases:
     version: 3.17.1
 team: oslo
 type: library
+repository-settings:
+  openstack/oslo.i18n: {}
diff --git a/deliverables/pike/oslo.log.yaml b/deliverables/pike/oslo.log.yaml
index 9132d3d972..e298d7e9f0 100644
--- a/deliverables/pike/oslo.log.yaml
+++ b/deliverables/pike/oslo.log.yaml
@@ -65,3 +65,5 @@ releases:
     version: 3.30.2
 team: oslo
 type: library
+repository-settings:
+  openstack/oslo.log: {}
diff --git a/deliverables/pike/oslo.messaging.yaml b/deliverables/pike/oslo.messaging.yaml
index d84355ce10..8b17a5fcce 100644
--- a/deliverables/pike/oslo.messaging.yaml
+++ b/deliverables/pike/oslo.messaging.yaml
@@ -77,3 +77,5 @@ branches:
   - name: stable/pike
     location: 5.30.0
 release-notes: https://docs.openstack.org/releasenotes/oslo.messaging/pike.html
+repository-settings:
+  openstack/oslo.messaging: {}
diff --git a/deliverables/pike/oslo.middleware.yaml b/deliverables/pike/oslo.middleware.yaml
index d26fa13d32..f32f7bbc2c 100644
--- a/deliverables/pike/oslo.middleware.yaml
+++ b/deliverables/pike/oslo.middleware.yaml
@@ -49,3 +49,5 @@ releases:
     version: 3.30.1
 team: oslo
 type: library
+repository-settings:
+  openstack/oslo.middleware: {}
diff --git a/deliverables/pike/oslo.policy.yaml b/deliverables/pike/oslo.policy.yaml
index 7b04c6f435..21504efb7e 100644
--- a/deliverables/pike/oslo.policy.yaml
+++ b/deliverables/pike/oslo.policy.yaml
@@ -53,3 +53,5 @@ releases:
     version: 1.25.2
 team: oslo
 type: library
+repository-settings:
+  openstack/oslo.policy: {}
diff --git a/deliverables/pike/oslo.privsep.yaml b/deliverables/pike/oslo.privsep.yaml
index f0d60aef9d..fe99df0e0d 100644
--- a/deliverables/pike/oslo.privsep.yaml
+++ b/deliverables/pike/oslo.privsep.yaml
@@ -41,3 +41,5 @@ releases:
     version: 1.22.1
 team: oslo
 type: library
+repository-settings:
+  openstack/oslo.privsep: {}
diff --git a/deliverables/pike/oslo.reports.yaml b/deliverables/pike/oslo.reports.yaml
index 5169d44983..02eaa02fa1 100644
--- a/deliverables/pike/oslo.reports.yaml
+++ b/deliverables/pike/oslo.reports.yaml
@@ -37,3 +37,5 @@ releases:
     version: 1.22.1
 team: oslo
 type: library
+repository-settings:
+  openstack/oslo.reports: {}
diff --git a/deliverables/pike/oslo.rootwrap.yaml b/deliverables/pike/oslo.rootwrap.yaml
index a8f532dd78..15719c6439 100644
--- a/deliverables/pike/oslo.rootwrap.yaml
+++ b/deliverables/pike/oslo.rootwrap.yaml
@@ -37,3 +37,5 @@ releases:
     version: 5.9.2
 team: oslo
 type: library
+repository-settings:
+  openstack/oslo.rootwrap: {}
diff --git a/deliverables/pike/oslo.serialization.yaml b/deliverables/pike/oslo.serialization.yaml
index 3c0e133da2..d4adb84abf 100644
--- a/deliverables/pike/oslo.serialization.yaml
+++ b/deliverables/pike/oslo.serialization.yaml
@@ -37,3 +37,5 @@ releases:
     version: 2.20.2
 team: oslo
 type: library
+repository-settings:
+  openstack/oslo.serialization: {}
diff --git a/deliverables/pike/oslo.service.yaml b/deliverables/pike/oslo.service.yaml
index b919cffe3a..240cc99e47 100644
--- a/deliverables/pike/oslo.service.yaml
+++ b/deliverables/pike/oslo.service.yaml
@@ -41,3 +41,5 @@ releases:
     version: 1.25.1
 team: oslo
 type: library
+repository-settings:
+  openstack/oslo.service: {}
diff --git a/deliverables/pike/oslo.utils.yaml b/deliverables/pike/oslo.utils.yaml
index 20eb2e3c34..d2be4902fc 100644
--- a/deliverables/pike/oslo.utils.yaml
+++ b/deliverables/pike/oslo.utils.yaml
@@ -41,3 +41,5 @@ releases:
     version: 3.28.1
 team: oslo
 type: library
+repository-settings:
+  openstack/oslo.utils: {}
diff --git a/deliverables/pike/oslo.versionedobjects.yaml b/deliverables/pike/oslo.versionedobjects.yaml
index 34483fee23..4dcc61bc0e 100644
--- a/deliverables/pike/oslo.versionedobjects.yaml
+++ b/deliverables/pike/oslo.versionedobjects.yaml
@@ -37,3 +37,5 @@ releases:
     version: 1.26.1
 team: oslo
 type: library
+repository-settings:
+  openstack/oslo.versionedobjects: {}
diff --git a/deliverables/pike/oslo.vmware.yaml b/deliverables/pike/oslo.vmware.yaml
index b7e06b4246..42949e4190 100644
--- a/deliverables/pike/oslo.vmware.yaml
+++ b/deliverables/pike/oslo.vmware.yaml
@@ -41,3 +41,5 @@ releases:
     version: 2.23.1
 team: oslo
 type: library
+repository-settings:
+  openstack/oslo.vmware: {}
diff --git a/deliverables/pike/oslosphinx.yaml b/deliverables/pike/oslosphinx.yaml
index 52d3dee5be..ac12b4e5a4 100644
--- a/deliverables/pike/oslosphinx.yaml
+++ b/deliverables/pike/oslosphinx.yaml
@@ -37,3 +37,5 @@ releases:
     version: 4.15.2
 team: oslo
 type: library
+repository-settings:
+  openstack/oslosphinx: {}
diff --git a/deliverables/pike/oslotest.yaml b/deliverables/pike/oslotest.yaml
index 7842da43dc..3dd7793e3e 100644
--- a/deliverables/pike/oslotest.yaml
+++ b/deliverables/pike/oslotest.yaml
@@ -33,3 +33,5 @@ releases:
     version: 2.17.1
 team: oslo
 type: library
+repository-settings:
+  openstack/oslotest: {}
diff --git a/deliverables/pike/osprofiler.yaml b/deliverables/pike/osprofiler.yaml
index b0bc928df6..252b659582 100644
--- a/deliverables/pike/osprofiler.yaml
+++ b/deliverables/pike/osprofiler.yaml
@@ -41,3 +41,5 @@ branches:
   - name: stable/pike
     location: 1.11.0
 release-notes: https://docs.openstack.org/releasenotes/osprofiler/pike.html
+repository-settings:
+  openstack/osprofiler: {}
diff --git a/deliverables/pike/ovsdbapp.yaml b/deliverables/pike/ovsdbapp.yaml
index 8aaef61c81..3a563b2286 100644
--- a/deliverables/pike/ovsdbapp.yaml
+++ b/deliverables/pike/ovsdbapp.yaml
@@ -31,3 +31,5 @@ releases:
 branches:
   - name: stable/pike
     location: 0.4.0
+repository-settings:
+  openstack/ovsdbapp: {}
diff --git a/deliverables/pike/panko.yaml b/deliverables/pike/panko.yaml
index 67a4a95ada..242b8816d0 100644
--- a/deliverables/pike/panko.yaml
+++ b/deliverables/pike/panko.yaml
@@ -17,3 +17,5 @@ releases:
 branches:
   - location: 3.0.0
     name: stable/pike
+repository-settings:
+  openstack/panko: {}
diff --git a/deliverables/pike/patrole.yaml b/deliverables/pike/patrole.yaml
index e2e7abbaeb..843346a565 100644
--- a/deliverables/pike/patrole.yaml
+++ b/deliverables/pike/patrole.yaml
@@ -1,7 +1,7 @@
 ---
 launchpad: patrole
 release-model: cycle-with-intermediary
-team: Quality Assurance
+team: 'Quality Assurance'
 type: other
 releases:
   - version: 0.1.0
@@ -12,3 +12,5 @@ releases:
     projects:
       - repo: openstack/patrole
         hash: 45fffa50e0020d4a34b1c3eac4b553522bf5fb35
+repository-settings:
+  openstack/patrole: {}
diff --git a/deliverables/pike/paunch.yaml b/deliverables/pike/paunch.yaml
index 644c0abd90..ef2f343576 100644
--- a/deliverables/pike/paunch.yaml
+++ b/deliverables/pike/paunch.yaml
@@ -45,3 +45,5 @@ releases:
         repo: openstack/paunch
     version: 1.5.3
 release-notes: https://docs.openstack.org/releasenotes/paunch/pike.html
+repository-settings:
+  openstack/paunch: {}
diff --git a/deliverables/pike/puppet-aodh.yaml b/deliverables/pike/puppet-aodh.yaml
index 9f13c1c025..006764b1f0 100644
--- a/deliverables/pike/puppet-aodh.yaml
+++ b/deliverables/pike/puppet-aodh.yaml
@@ -28,3 +28,5 @@ branches:
   - location: 11.3.0
     name: stable/pike
 release-notes: https://docs.openstack.org/releasenotes/puppet-aodh/pike.html
+repository-settings:
+  openstack/puppet-aodh: {}
diff --git a/deliverables/pike/puppet-barbican.yaml b/deliverables/pike/puppet-barbican.yaml
index 1f716e6306..fe9fdb3120 100644
--- a/deliverables/pike/puppet-barbican.yaml
+++ b/deliverables/pike/puppet-barbican.yaml
@@ -32,3 +32,5 @@ branches:
   - location: 11.3.0
     name: stable/pike
 release-notes: https://docs.openstack.org/releasenotes/puppet-barbican/pike.html
+repository-settings:
+  openstack/puppet-barbican: {}
diff --git a/deliverables/pike/puppet-ceilometer.yaml b/deliverables/pike/puppet-ceilometer.yaml
index ba2b19e5fe..e4c86f4e40 100644
--- a/deliverables/pike/puppet-ceilometer.yaml
+++ b/deliverables/pike/puppet-ceilometer.yaml
@@ -32,3 +32,5 @@ branches:
   - location: 11.3.0
     name: stable/pike
 release-notes: https://docs.openstack.org/releasenotes/puppet-ceilometer/pike.html
+repository-settings:
+  openstack/puppet-ceilometer: {}
diff --git a/deliverables/pike/puppet-cinder.yaml b/deliverables/pike/puppet-cinder.yaml
index e6f7b2e306..60285282f6 100644
--- a/deliverables/pike/puppet-cinder.yaml
+++ b/deliverables/pike/puppet-cinder.yaml
@@ -32,3 +32,5 @@ branches:
   - location: 11.3.0
     name: stable/pike
 release-notes: https://docs.openstack.org/releasenotes/puppet-cinder/pike.html
+repository-settings:
+  openstack/puppet-cinder: {}
diff --git a/deliverables/pike/puppet-congress.yaml b/deliverables/pike/puppet-congress.yaml
index f02b22b023..8ca8fed133 100644
--- a/deliverables/pike/puppet-congress.yaml
+++ b/deliverables/pike/puppet-congress.yaml
@@ -32,3 +32,5 @@ branches:
   - location: 11.3.0
     name: stable/pike
 release-notes: https://docs.openstack.org/releasenotes/puppet-congress/pike.html
+repository-settings:
+  openstack/puppet-congress: {}
diff --git a/deliverables/pike/puppet-designate.yaml b/deliverables/pike/puppet-designate.yaml
index 7e04ef03d3..be3cd58101 100644
--- a/deliverables/pike/puppet-designate.yaml
+++ b/deliverables/pike/puppet-designate.yaml
@@ -32,3 +32,5 @@ branches:
   - location: 11.3.0
     name: stable/pike
 release-notes: https://docs.openstack.org/releasenotes/puppet-designate/pike.html
+repository-settings:
+  openstack/puppet-designate: {}
diff --git a/deliverables/pike/puppet-ec2api.yaml b/deliverables/pike/puppet-ec2api.yaml
index 440767842c..54e62a1f40 100644
--- a/deliverables/pike/puppet-ec2api.yaml
+++ b/deliverables/pike/puppet-ec2api.yaml
@@ -32,3 +32,5 @@ branches:
   - location: 11.3.0
     name: stable/pike
 release-notes: https://docs.openstack.org/releasenotes/puppet-ec2api/pike.html
+repository-settings:
+  openstack/puppet-ec2api: {}
diff --git a/deliverables/pike/puppet-glance.yaml b/deliverables/pike/puppet-glance.yaml
index a97ab31e38..91cae1da2c 100644
--- a/deliverables/pike/puppet-glance.yaml
+++ b/deliverables/pike/puppet-glance.yaml
@@ -32,3 +32,5 @@ branches:
   - location: 11.3.0
     name: stable/pike
 release-notes: https://docs.openstack.org/releasenotes/puppet-glance/pike.html
+repository-settings:
+  openstack/puppet-glance: {}
diff --git a/deliverables/pike/puppet-gnocchi.yaml b/deliverables/pike/puppet-gnocchi.yaml
index ecbfbe94f7..49625514bf 100644
--- a/deliverables/pike/puppet-gnocchi.yaml
+++ b/deliverables/pike/puppet-gnocchi.yaml
@@ -32,3 +32,5 @@ branches:
   - location: 11.3.0
     name: stable/pike
 release-notes: https://docs.openstack.org/releasenotes/puppet-gnocchi/pike.html
+repository-settings:
+  openstack/puppet-gnocchi: {}
diff --git a/deliverables/pike/puppet-heat.yaml b/deliverables/pike/puppet-heat.yaml
index 4773d75157..cce8be3360 100644
--- a/deliverables/pike/puppet-heat.yaml
+++ b/deliverables/pike/puppet-heat.yaml
@@ -32,3 +32,5 @@ branches:
   - location: 11.3.0
     name: stable/pike
 release-notes: https://docs.openstack.org/releasenotes/puppet-heat/pike.html
+repository-settings:
+  openstack/puppet-heat: {}
diff --git a/deliverables/pike/puppet-horizon.yaml b/deliverables/pike/puppet-horizon.yaml
index 71a7293c1f..59dc230462 100644
--- a/deliverables/pike/puppet-horizon.yaml
+++ b/deliverables/pike/puppet-horizon.yaml
@@ -36,3 +36,5 @@ branches:
   - location: 11.3.0
     name: stable/pike
 release-notes: https://docs.openstack.org/releasenotes/puppet-horizon/pike.html
+repository-settings:
+  openstack/puppet-horizon: {}
diff --git a/deliverables/pike/puppet-ironic.yaml b/deliverables/pike/puppet-ironic.yaml
index f5ee85a644..3e83c89455 100644
--- a/deliverables/pike/puppet-ironic.yaml
+++ b/deliverables/pike/puppet-ironic.yaml
@@ -32,3 +32,5 @@ branches:
   - location: 11.3.0
     name: stable/pike
 release-notes: https://docs.openstack.org/releasenotes/puppet-ironic/pike.html
+repository-settings:
+  openstack/puppet-ironic: {}
diff --git a/deliverables/pike/puppet-keystone.yaml b/deliverables/pike/puppet-keystone.yaml
index 252faca498..6567ae1277 100644
--- a/deliverables/pike/puppet-keystone.yaml
+++ b/deliverables/pike/puppet-keystone.yaml
@@ -32,3 +32,5 @@ branches:
   - location: 11.3.0
     name: stable/pike
 release-notes: https://docs.openstack.org/releasenotes/puppet-keystone/pike.html
+repository-settings:
+  openstack/puppet-keystone: {}
diff --git a/deliverables/pike/puppet-magnum.yaml b/deliverables/pike/puppet-magnum.yaml
index db9370a24a..68932eca7e 100644
--- a/deliverables/pike/puppet-magnum.yaml
+++ b/deliverables/pike/puppet-magnum.yaml
@@ -32,3 +32,5 @@ branches:
   - location: 11.3.0
     name: stable/pike
 release-notes: https://docs.openstack.org/releasenotes/puppet-magnum/pike.html
+repository-settings:
+  openstack/puppet-magnum: {}
diff --git a/deliverables/pike/puppet-manila.yaml b/deliverables/pike/puppet-manila.yaml
index 5c84535160..939ad29a58 100644
--- a/deliverables/pike/puppet-manila.yaml
+++ b/deliverables/pike/puppet-manila.yaml
@@ -32,3 +32,5 @@ branches:
   - location: 11.3.0
     name: stable/pike
 release-notes: https://docs.openstack.org/releasenotes/puppet-manila/pike.html
+repository-settings:
+  openstack/puppet-manila: {}
diff --git a/deliverables/pike/puppet-mistral.yaml b/deliverables/pike/puppet-mistral.yaml
index 119e88fe9e..fd4da9e2f5 100644
--- a/deliverables/pike/puppet-mistral.yaml
+++ b/deliverables/pike/puppet-mistral.yaml
@@ -32,3 +32,5 @@ branches:
   - location: 11.3.0
     name: stable/pike
 release-notes: https://docs.openstack.org/releasenotes/puppet-mistral/pike.html
+repository-settings:
+  openstack/puppet-mistral: {}
diff --git a/deliverables/pike/puppet-murano.yaml b/deliverables/pike/puppet-murano.yaml
index a253cf9329..6a1a6492b1 100644
--- a/deliverables/pike/puppet-murano.yaml
+++ b/deliverables/pike/puppet-murano.yaml
@@ -36,3 +36,5 @@ branches:
   - location: 11.3.0
     name: stable/pike
 release-notes: https://docs.openstack.org/releasenotes/puppet-murano/pike.html
+repository-settings:
+  openstack/puppet-murano: {}
diff --git a/deliverables/pike/puppet-neutron.yaml b/deliverables/pike/puppet-neutron.yaml
index 6266e77e7d..5bb785b85d 100644
--- a/deliverables/pike/puppet-neutron.yaml
+++ b/deliverables/pike/puppet-neutron.yaml
@@ -32,3 +32,5 @@ branches:
   - location: 11.3.0
     name: stable/pike
 release-notes: https://docs.openstack.org/releasenotes/puppet-neutron/pike.html
+repository-settings:
+  openstack/puppet-neutron: {}
diff --git a/deliverables/pike/puppet-nova.yaml b/deliverables/pike/puppet-nova.yaml
index dabaa9c526..5b3567cdef 100644
--- a/deliverables/pike/puppet-nova.yaml
+++ b/deliverables/pike/puppet-nova.yaml
@@ -36,3 +36,5 @@ branches:
   - location: 11.3.0
     name: stable/pike
 release-notes: https://docs.openstack.org/releasenotes/puppet-nova/pike.html
+repository-settings:
+  openstack/puppet-nova: {}
diff --git a/deliverables/pike/puppet-octavia.yaml b/deliverables/pike/puppet-octavia.yaml
index e2b4c39561..22d0e476a9 100644
--- a/deliverables/pike/puppet-octavia.yaml
+++ b/deliverables/pike/puppet-octavia.yaml
@@ -32,3 +32,5 @@ branches:
   - location: 11.3.0
     name: stable/pike
 release-notes: https://docs.openstack.org/releasenotes/puppet-octavia/pike.html
+repository-settings:
+  openstack/puppet-octavia: {}
diff --git a/deliverables/pike/puppet-openstack_extras.yaml b/deliverables/pike/puppet-openstack_extras.yaml
index 48cf2a541f..de679f023a 100644
--- a/deliverables/pike/puppet-openstack_extras.yaml
+++ b/deliverables/pike/puppet-openstack_extras.yaml
@@ -32,3 +32,5 @@ branches:
   - location: 11.3.0
     name: stable/pike
 release-notes: https://docs.openstack.org/releasenotes/puppet-openstack_extras/pike.html
+repository-settings:
+  openstack/puppet-openstack_extras: {}
diff --git a/deliverables/pike/puppet-openstacklib.yaml b/deliverables/pike/puppet-openstacklib.yaml
index eb71726813..3172fdd6d2 100644
--- a/deliverables/pike/puppet-openstacklib.yaml
+++ b/deliverables/pike/puppet-openstacklib.yaml
@@ -32,3 +32,5 @@ branches:
   - location: 11.3.0
     name: stable/pike
 release-notes: https://docs.openstack.org/releasenotes/puppet-openstacklib/pike.html
+repository-settings:
+  openstack/puppet-openstacklib: {}
diff --git a/deliverables/pike/puppet-oslo.yaml b/deliverables/pike/puppet-oslo.yaml
index 8f266381fd..220ae2ad45 100644
--- a/deliverables/pike/puppet-oslo.yaml
+++ b/deliverables/pike/puppet-oslo.yaml
@@ -32,3 +32,5 @@ branches:
   - location: 11.3.0
     name: stable/pike
 release-notes: https://docs.openstack.org/releasenotes/puppet-oslo/pike.html
+repository-settings:
+  openstack/puppet-oslo: {}
diff --git a/deliverables/pike/puppet-ovn.yaml b/deliverables/pike/puppet-ovn.yaml
index fdc2c86738..7143bf1ca3 100644
--- a/deliverables/pike/puppet-ovn.yaml
+++ b/deliverables/pike/puppet-ovn.yaml
@@ -32,3 +32,5 @@ branches:
   - location: 11.3.0
     name: stable/pike
 release-notes: https://docs.openstack.org/releasenotes/puppet-ovn/pike.html
+repository-settings:
+  openstack/puppet-ovn: {}
diff --git a/deliverables/pike/puppet-panko.yaml b/deliverables/pike/puppet-panko.yaml
index 552ce5dd32..bad0f2d3e3 100644
--- a/deliverables/pike/puppet-panko.yaml
+++ b/deliverables/pike/puppet-panko.yaml
@@ -32,3 +32,5 @@ branches:
   - location: 11.3.0
     name: stable/pike
 release-notes: https://docs.openstack.org/releasenotes/puppet-panko/pike.html
+repository-settings:
+  openstack/puppet-panko: {}
diff --git a/deliverables/pike/puppet-sahara.yaml b/deliverables/pike/puppet-sahara.yaml
index abce7654e1..f36966aa94 100644
--- a/deliverables/pike/puppet-sahara.yaml
+++ b/deliverables/pike/puppet-sahara.yaml
@@ -32,3 +32,5 @@ branches:
   - location: 11.3.0
     name: stable/pike
 release-notes: https://docs.openstack.org/releasenotes/puppet-sahara/pike.html
+repository-settings:
+  openstack/puppet-sahara: {}
diff --git a/deliverables/pike/puppet-swift.yaml b/deliverables/pike/puppet-swift.yaml
index b43d0a0a2e..6738db3ec7 100644
--- a/deliverables/pike/puppet-swift.yaml
+++ b/deliverables/pike/puppet-swift.yaml
@@ -32,3 +32,5 @@ branches:
   - location: 11.3.0
     name: stable/pike
 release-notes: https://docs.openstack.org/releasenotes/puppet-swift/pike.html
+repository-settings:
+  openstack/puppet-swift: {}
diff --git a/deliverables/pike/puppet-tacker.yaml b/deliverables/pike/puppet-tacker.yaml
index c54d6c1955..9d13869468 100644
--- a/deliverables/pike/puppet-tacker.yaml
+++ b/deliverables/pike/puppet-tacker.yaml
@@ -32,3 +32,5 @@ branches:
   - location: 11.3.0
     name: stable/pike
 release-notes: https://docs.openstack.org/releasenotes/puppet-tacker/pike.html
+repository-settings:
+  openstack/puppet-tacker: {}
diff --git a/deliverables/pike/puppet-tempest.yaml b/deliverables/pike/puppet-tempest.yaml
index dd424dbaea..1bb05b26f0 100644
--- a/deliverables/pike/puppet-tempest.yaml
+++ b/deliverables/pike/puppet-tempest.yaml
@@ -32,3 +32,5 @@ branches:
   - location: 11.3.0
     name: stable/pike
 release-notes: https://docs.openstack.org/releasenotes/puppet-tempest/pike.html
+repository-settings:
+  openstack/puppet-tempest: {}
diff --git a/deliverables/pike/puppet-tripleo.yaml b/deliverables/pike/puppet-tripleo.yaml
index 1bb1cb4ef5..7222026ca3 100644
--- a/deliverables/pike/puppet-tripleo.yaml
+++ b/deliverables/pike/puppet-tripleo.yaml
@@ -60,3 +60,5 @@ releases:
 team: tripleo
 type: other
 release-notes: https://docs.openstack.org/releasenotes/puppet-tripleo/pike.html
+repository-settings:
+  openstack/puppet-tripleo: {}
diff --git a/deliverables/pike/puppet-trove.yaml b/deliverables/pike/puppet-trove.yaml
index e0c1f92998..7b9809f81d 100644
--- a/deliverables/pike/puppet-trove.yaml
+++ b/deliverables/pike/puppet-trove.yaml
@@ -32,3 +32,5 @@ branches:
   - location: 11.3.0
     name: stable/pike
 release-notes: https://docs.openstack.org/releasenotes/puppet-trove/pike.html
+repository-settings:
+  openstack/puppet-trove: {}
diff --git a/deliverables/pike/puppet-vitrage.yaml b/deliverables/pike/puppet-vitrage.yaml
index 73a8d1b4dc..60fa92ffa2 100644
--- a/deliverables/pike/puppet-vitrage.yaml
+++ b/deliverables/pike/puppet-vitrage.yaml
@@ -9,3 +9,5 @@ releases:
 team: 'Puppet OpenStack'
 type: other
 release-notes: https://docs.openstack.org/releasenotes/puppet-vitrage/pike.html
+repository-settings:
+  openstack/puppet-vitrage: {}
diff --git a/deliverables/pike/puppet-vswitch.yaml b/deliverables/pike/puppet-vswitch.yaml
index 297cc1fd86..7945e6b3b4 100644
--- a/deliverables/pike/puppet-vswitch.yaml
+++ b/deliverables/pike/puppet-vswitch.yaml
@@ -32,3 +32,5 @@ branches:
   - location: 7.3.0
     name: stable/pike
 release-notes: https://docs.openstack.org/releasenotes/puppet-vswitch/pike.html
+repository-settings:
+  openstack/puppet-vswitch: {}
diff --git a/deliverables/pike/puppet-watcher.yaml b/deliverables/pike/puppet-watcher.yaml
index f191452766..a67e3cac43 100644
--- a/deliverables/pike/puppet-watcher.yaml
+++ b/deliverables/pike/puppet-watcher.yaml
@@ -28,3 +28,5 @@ branches:
   - location: 11.3.0
     name: stable/pike
 release-notes: https://docs.openstack.org/releasenotes/puppet-watcher/pike.html
+repository-settings:
+  openstack/puppet-watcher: {}
diff --git a/deliverables/pike/puppet-zaqar.yaml b/deliverables/pike/puppet-zaqar.yaml
index bb42d276bf..68d8cbed59 100644
--- a/deliverables/pike/puppet-zaqar.yaml
+++ b/deliverables/pike/puppet-zaqar.yaml
@@ -32,3 +32,5 @@ branches:
   - location: 11.3.0
     name: stable/pike
 release-notes: https://docs.openstack.org/releasenotes/puppet-zaqar/pike.html
+repository-settings:
+  openstack/puppet-zaqar: {}
diff --git a/deliverables/pike/pycadf.yaml b/deliverables/pike/pycadf.yaml
index c7e9722d8f..d914854fba 100644
--- a/deliverables/pike/pycadf.yaml
+++ b/deliverables/pike/pycadf.yaml
@@ -12,3 +12,5 @@ releases:
 branches:
   - name: stable/pike
     location: 2.6.0
+repository-settings:
+  openstack/pycadf: {}
diff --git a/deliverables/pike/python-aodhclient.yaml b/deliverables/pike/python-aodhclient.yaml
index 8414d7d4e4..93f5bcba10 100644
--- a/deliverables/pike/python-aodhclient.yaml
+++ b/deliverables/pike/python-aodhclient.yaml
@@ -1,5 +1,5 @@
 ---
-include-pypi-link: true
+include-pypi-link: yes
 launchpad: python-aodhclient
 release-model: cycle-with-intermediary
 team: Telemetry
@@ -13,3 +13,5 @@ releases:
 branches:
   - name: stable/pike
     location: 0.9.0
+repository-settings:
+  openstack/python-aodhclient: {}
diff --git a/deliverables/pike/python-barbicanclient.yaml b/deliverables/pike/python-barbicanclient.yaml
index 3a61342d09..3e0c778ddc 100644
--- a/deliverables/pike/python-barbicanclient.yaml
+++ b/deliverables/pike/python-barbicanclient.yaml
@@ -27,3 +27,5 @@ releases:
 branches:
   - location: 4.5.2
     name: stable/pike
+repository-settings:
+  openstack/python-barbicanclient: {}
diff --git a/deliverables/pike/python-blazarclient.yaml b/deliverables/pike/python-blazarclient.yaml
index aad980f0b9..91e16b969a 100644
--- a/deliverables/pike/python-blazarclient.yaml
+++ b/deliverables/pike/python-blazarclient.yaml
@@ -13,5 +13,6 @@ releases:
     projects:
       - repo: openstack/python-blazarclient
         hash: bd842add76784d6adb62283c6f8168d30946cd87
-        highlights: |-
-          - Fixed backward compatibility issue in 0.3.0.
+        highlights: '- Fixed backward compatibility issue in 0.3.0.'
+repository-settings:
+  openstack/python-blazarclient: {}
diff --git a/deliverables/pike/python-brick-cinderclient-ext.yaml b/deliverables/pike/python-brick-cinderclient-ext.yaml
index aac8bd5cc6..834aa57192 100644
--- a/deliverables/pike/python-brick-cinderclient-ext.yaml
+++ b/deliverables/pike/python-brick-cinderclient-ext.yaml
@@ -1,5 +1,5 @@
 ---
-include-pypi-link: true
+include-pypi-link: yes
 launchpad: python-cinderclient
 release-model: cycle-with-intermediary
 team: cinder
@@ -16,3 +16,5 @@ releases:
 branches:
   - name: stable/pike
     location: 0.5.0
+repository-settings:
+  openstack/python-brick-cinderclient-ext: {}
diff --git a/deliverables/pike/python-ceilometerclient.yaml b/deliverables/pike/python-ceilometerclient.yaml
index 460dd1bdce..9209b5edc7 100644
--- a/deliverables/pike/python-ceilometerclient.yaml
+++ b/deliverables/pike/python-ceilometerclient.yaml
@@ -1,5 +1,5 @@
 ---
-include-pypi-link: true
+include-pypi-link: yes
 launchpad: python-ceilometerclient
 release-model: cycle-with-intermediary
 team: Telemetry
@@ -12,3 +12,7 @@ releases:
 branches:
   - name: stable/pike
     location: 2.9.0
+repository-settings:
+  openstack/python-ceilometerclient:
+    flags:
+      - retired
diff --git a/deliverables/pike/python-cinderclient.yaml b/deliverables/pike/python-cinderclient.yaml
index 1f525fac5e..b0b37843b7 100644
--- a/deliverables/pike/python-cinderclient.yaml
+++ b/deliverables/pike/python-cinderclient.yaml
@@ -38,3 +38,5 @@ releases:
 branches:
   - name: stable/pike
     location: 3.1.0
+repository-settings:
+  openstack/python-cinderclient: {}
diff --git a/deliverables/pike/python-cloudkittyclient.yaml b/deliverables/pike/python-cloudkittyclient.yaml
index 9dc5444fba..ad88ffb4df 100644
--- a/deliverables/pike/python-cloudkittyclient.yaml
+++ b/deliverables/pike/python-cloudkittyclient.yaml
@@ -1,5 +1,5 @@
 ---
-include-pypi-link: true
+include-pypi-link: yes
 launchpad: cloudkitty
 release-model: cycle-with-intermediary
 team: cloudkitty
@@ -9,8 +9,10 @@ releases:
     projects:
       - repo: openstack/python-cloudkittyclient
         hash: cf2b4f31c77d0590e1034cb9327d5eda832baa08
-    highlights: >
+    highlights: |
       Update on test requirements.
 branches:
   - name: stable/pike
     location: 1.1.0
+repository-settings:
+  openstack/python-cloudkittyclient: {}
diff --git a/deliverables/pike/python-congressclient.yaml b/deliverables/pike/python-congressclient.yaml
index dc34e04ffe..37d51ed013 100644
--- a/deliverables/pike/python-congressclient.yaml
+++ b/deliverables/pike/python-congressclient.yaml
@@ -1,5 +1,5 @@
 ---
-include-pypi-link: true
+include-pypi-link: yes
 launchpad: python-congressclient
 release-model: cycle-with-intermediary
 team: congress
@@ -16,3 +16,5 @@ releases:
 branches:
   - name: stable/pike
     location: 1.8.0
+repository-settings:
+  openstack/python-congressclient: {}
diff --git a/deliverables/pike/python-designateclient.yaml b/deliverables/pike/python-designateclient.yaml
index ef9bc936e8..aa10eb5612 100644
--- a/deliverables/pike/python-designateclient.yaml
+++ b/deliverables/pike/python-designateclient.yaml
@@ -1,5 +1,5 @@
 ---
-include-pypi-link: true
+include-pypi-link: yes
 launchpad: python-designateclient
 release-model: cycle-with-intermediary
 team: designate
@@ -12,3 +12,5 @@ releases:
 branches:
   - name: stable/pike
     location: 2.7.0
+repository-settings:
+  openstack/python-designateclient: {}
diff --git a/deliverables/pike/python-freezerclient.yaml b/deliverables/pike/python-freezerclient.yaml
index 0967034476..2704616ee6 100644
--- a/deliverables/pike/python-freezerclient.yaml
+++ b/deliverables/pike/python-freezerclient.yaml
@@ -20,3 +20,5 @@ branches:
   - name: stable/pike
     location: 1.5.0
 release-notes: https://docs.openstack.org/releasenotes/python-freezerclient/pike.html
+repository-settings:
+  openstack/python-freezerclient: {}
diff --git a/deliverables/pike/python-glanceclient.yaml b/deliverables/pike/python-glanceclient.yaml
index abbec80c4f..3087568c84 100644
--- a/deliverables/pike/python-glanceclient.yaml
+++ b/deliverables/pike/python-glanceclient.yaml
@@ -25,3 +25,5 @@ releases:
     version: 2.8.0
 team: glance
 type: library
+repository-settings:
+  openstack/python-glanceclient: {}
diff --git a/deliverables/pike/python-heatclient.yaml b/deliverables/pike/python-heatclient.yaml
index 7e687d11b9..9937f97dc6 100644
--- a/deliverables/pike/python-heatclient.yaml
+++ b/deliverables/pike/python-heatclient.yaml
@@ -1,5 +1,5 @@
 ---
-include-pypi-link: true
+include-pypi-link: yes
 launchpad: python-heatclient
 release-model: cycle-with-intermediary
 team: heat
@@ -24,3 +24,5 @@ releases:
 branches:
   - name: stable/pike
     location: 1.11.0
+repository-settings:
+  openstack/python-heatclient: {}
diff --git a/deliverables/pike/python-ironic-inspector-client.yaml b/deliverables/pike/python-ironic-inspector-client.yaml
index 8cf1d162ba..472dafc83b 100644
--- a/deliverables/pike/python-ironic-inspector-client.yaml
+++ b/deliverables/pike/python-ironic-inspector-client.yaml
@@ -21,3 +21,5 @@ releases:
     version: 2.1.0
 team: ironic
 type: library
+repository-settings:
+  openstack/python-ironic-inspector-client: {}
diff --git a/deliverables/pike/python-ironicclient.yaml b/deliverables/pike/python-ironicclient.yaml
index 650270589c..8c55b9b7de 100644
--- a/deliverables/pike/python-ironicclient.yaml
+++ b/deliverables/pike/python-ironicclient.yaml
@@ -37,3 +37,5 @@ releases:
     version: 1.17.1
 team: ironic
 type: library
+repository-settings:
+  openstack/python-ironicclient: {}
diff --git a/deliverables/pike/python-karborclient.yaml b/deliverables/pike/python-karborclient.yaml
index 4562010d6b..b3d36805c3 100644
--- a/deliverables/pike/python-karborclient.yaml
+++ b/deliverables/pike/python-karborclient.yaml
@@ -24,3 +24,5 @@ releases:
 branches:
   - name: stable/pike
     location: 0.6.0
+repository-settings:
+  openstack/python-karborclient: {}
diff --git a/deliverables/pike/python-keystoneclient.yaml b/deliverables/pike/python-keystoneclient.yaml
index 996d6d69fa..0c38f8aa65 100644
--- a/deliverables/pike/python-keystoneclient.yaml
+++ b/deliverables/pike/python-keystoneclient.yaml
@@ -21,3 +21,5 @@ releases:
     version: 3.13.0
 team: keystone
 type: library
+repository-settings:
+  openstack/python-keystoneclient: {}
diff --git a/deliverables/pike/python-magnumclient.yaml b/deliverables/pike/python-magnumclient.yaml
index 4bc276edc8..cc2d897b35 100644
--- a/deliverables/pike/python-magnumclient.yaml
+++ b/deliverables/pike/python-magnumclient.yaml
@@ -1,5 +1,5 @@
 ---
-include-pypi-link: true
+include-pypi-link: yes
 launchpad: python-magnumclient
 release-model: cycle-with-intermediary
 team: magnum
@@ -16,3 +16,5 @@ releases:
 branches:
   - name: stable/pike
     location: 2.7.0
+repository-settings:
+  openstack/python-magnumclient: {}
diff --git a/deliverables/pike/python-manilaclient.yaml b/deliverables/pike/python-manilaclient.yaml
index 4cd2358b51..e8bec5cd80 100644
--- a/deliverables/pike/python-manilaclient.yaml
+++ b/deliverables/pike/python-manilaclient.yaml
@@ -29,3 +29,5 @@ releases:
     version: 1.17.2
 team: manila
 type: library
+repository-settings:
+  openstack/python-manilaclient: {}
diff --git a/deliverables/pike/python-mistralclient.yaml b/deliverables/pike/python-mistralclient.yaml
index fc59732d58..cb12ec0093 100644
--- a/deliverables/pike/python-mistralclient.yaml
+++ b/deliverables/pike/python-mistralclient.yaml
@@ -39,3 +39,5 @@ releases:
         hash: 291501ae6dc16f20ed53af975840d6c3ef3acc7b
     highlights: |
       - Don't perform authentication for help and bash completion.
+repository-settings:
+  openstack/python-mistralclient: {}
diff --git a/deliverables/pike/python-monascaclient.yaml b/deliverables/pike/python-monascaclient.yaml
index 9ebbab5c72..c0ff25634e 100644
--- a/deliverables/pike/python-monascaclient.yaml
+++ b/deliverables/pike/python-monascaclient.yaml
@@ -20,3 +20,5 @@ releases:
 branches:
   - name: stable/pike
     location: 1.7.0
+repository-settings:
+  openstack/python-monascaclient: {}
diff --git a/deliverables/pike/python-muranoclient.yaml b/deliverables/pike/python-muranoclient.yaml
index 981e71cdd2..9e57163429 100644
--- a/deliverables/pike/python-muranoclient.yaml
+++ b/deliverables/pike/python-muranoclient.yaml
@@ -17,3 +17,5 @@ releases:
     version: 0.14.0
 team: murano
 type: library
+repository-settings:
+  openstack/python-muranoclient: {}
diff --git a/deliverables/pike/python-neutronclient.yaml b/deliverables/pike/python-neutronclient.yaml
index e5c15a6011..3f195245b1 100644
--- a/deliverables/pike/python-neutronclient.yaml
+++ b/deliverables/pike/python-neutronclient.yaml
@@ -37,3 +37,5 @@ releases:
     version: 6.5.0
 team: neutron
 type: library
+repository-settings:
+  openstack/python-neutronclient: {}
diff --git a/deliverables/pike/python-novaclient.yaml b/deliverables/pike/python-novaclient.yaml
index ee76541898..e41adbb2f0 100644
--- a/deliverables/pike/python-novaclient.yaml
+++ b/deliverables/pike/python-novaclient.yaml
@@ -37,3 +37,5 @@ releases:
         repo: openstack/python-novaclient
 team: nova
 type: library
+repository-settings:
+  openstack/python-novaclient: {}
diff --git a/deliverables/pike/python-octaviaclient.yaml b/deliverables/pike/python-octaviaclient.yaml
index 30b0f7c6ac..172daad199 100644
--- a/deliverables/pike/python-octaviaclient.yaml
+++ b/deliverables/pike/python-octaviaclient.yaml
@@ -28,3 +28,5 @@ branches:
   - name: stable/pike
     location: 1.1.0
 release-notes: https://docs.openstack.org/releasenotes/python-octaviaclient/pike.html
+repository-settings:
+  openstack/python-octaviaclient: {}
diff --git a/deliverables/pike/python-openstackclient.yaml b/deliverables/pike/python-openstackclient.yaml
index b173e3e957..9ee41876df 100644
--- a/deliverables/pike/python-openstackclient.yaml
+++ b/deliverables/pike/python-openstackclient.yaml
@@ -28,3 +28,5 @@ releases:
       - repo: openstack/python-openstackclient
         hash: f67ebce530d13c8da4ad32556d93095ab0ff0392
 release-notes: https://docs.openstack.org/releasenotes/python-openstackclient/pike.html
+repository-settings:
+  openstack/python-openstackclient: {}
diff --git a/deliverables/pike/python-pankoclient.yaml b/deliverables/pike/python-pankoclient.yaml
index 6ab6f1541c..5a38e1be53 100644
--- a/deliverables/pike/python-pankoclient.yaml
+++ b/deliverables/pike/python-pankoclient.yaml
@@ -1,5 +1,5 @@
 ---
-include-pypi-link: true
+include-pypi-link: yes
 launchpad: python-pankoclient
 release-model: cycle-with-intermediary
 team: Telemetry
@@ -13,3 +13,5 @@ releases:
 branches:
   - name: stable/pike
     location: 0.3.0
+repository-settings:
+  openstack/python-pankoclient: {}
diff --git a/deliverables/pike/python-saharaclient.yaml b/deliverables/pike/python-saharaclient.yaml
index 73211a6a7d..fa81ec00d8 100644
--- a/deliverables/pike/python-saharaclient.yaml
+++ b/deliverables/pike/python-saharaclient.yaml
@@ -17,3 +17,5 @@ branches:
   - name: stable/pike
     location: 1.3.0
 release-notes: https://docs.openstack.org/releasenotes/python-saharaclient/pike.html
+repository-settings:
+  openstack/python-saharaclient: {}
diff --git a/deliverables/pike/python-searchlightclient.yaml b/deliverables/pike/python-searchlightclient.yaml
index c66d80d621..5be0db8e6a 100644
--- a/deliverables/pike/python-searchlightclient.yaml
+++ b/deliverables/pike/python-searchlightclient.yaml
@@ -1,5 +1,5 @@
 ---
-include-pypi-link: true
+include-pypi-link: yes
 launchpad: python-searchlightclient
 release-model: cycle-with-intermediary
 team: searchlight
@@ -12,3 +12,5 @@ releases:
     projects:
       - repo: openstack/python-searchlightclient
         hash: f9208e7273f6b5c6b7144a53fd82c2e2c7fac483
+repository-settings:
+  openstack/python-searchlightclient: {}
diff --git a/deliverables/pike/python-senlinclient.yaml b/deliverables/pike/python-senlinclient.yaml
index 8007a31807..6ff079197a 100644
--- a/deliverables/pike/python-senlinclient.yaml
+++ b/deliverables/pike/python-senlinclient.yaml
@@ -17,3 +17,5 @@ releases:
     version: 1.4.0
 team: senlin
 type: library
+repository-settings:
+  openstack/python-senlinclient: {}
diff --git a/deliverables/pike/python-solumclient.yaml b/deliverables/pike/python-solumclient.yaml
index 80c84899c7..0966354676 100644
--- a/deliverables/pike/python-solumclient.yaml
+++ b/deliverables/pike/python-solumclient.yaml
@@ -19,3 +19,5 @@ releases:
 branches:
   - name: stable/pike
     location: 2.5.0
+repository-settings:
+  openstack/python-solumclient: {}
diff --git a/deliverables/pike/python-swiftclient.yaml b/deliverables/pike/python-swiftclient.yaml
index f09c006c66..e33ac45e31 100644
--- a/deliverables/pike/python-swiftclient.yaml
+++ b/deliverables/pike/python-swiftclient.yaml
@@ -13,3 +13,5 @@ releases:
 branches:
   - name: stable/pike
     location: 3.4.0
+repository-settings:
+  openstack/python-swiftclient: {}
diff --git a/deliverables/pike/python-tackerclient.yaml b/deliverables/pike/python-tackerclient.yaml
index 72fc0c75a7..9331019295 100644
--- a/deliverables/pike/python-tackerclient.yaml
+++ b/deliverables/pike/python-tackerclient.yaml
@@ -17,3 +17,5 @@ branches:
   - name: stable/pike
     location: 0.10.0
 release-notes: https://docs.openstack.org/releasenotes/python-tackerclient/pike.html
+repository-settings:
+  openstack/python-tackerclient: {}
diff --git a/deliverables/pike/python-tricircleclient.yaml b/deliverables/pike/python-tricircleclient.yaml
index 617c1b8917..fb87b76c22 100644
--- a/deliverables/pike/python-tricircleclient.yaml
+++ b/deliverables/pike/python-tricircleclient.yaml
@@ -22,3 +22,5 @@ releases:
       - repo: openstack/python-tricircleclient
         tarball-base: tricircleclient
         hash: 563f700b62de6b57671ec077293da6fa348c250a
+repository-settings:
+  openstack/python-tricircleclient: {}
diff --git a/deliverables/pike/python-tripleoclient.yaml b/deliverables/pike/python-tripleoclient.yaml
index 4f3362d52b..d7aa4e6f17 100644
--- a/deliverables/pike/python-tripleoclient.yaml
+++ b/deliverables/pike/python-tripleoclient.yaml
@@ -53,3 +53,5 @@ releases:
 team: tripleo
 type: library
 release-notes: https://docs.openstack.org/releasenotes/python-tripleoclient/pike.html
+repository-settings:
+  openstack/python-tripleoclient: {}
diff --git a/deliverables/pike/python-troveclient.yaml b/deliverables/pike/python-troveclient.yaml
index 0491d17e6f..2bd706b369 100644
--- a/deliverables/pike/python-troveclient.yaml
+++ b/deliverables/pike/python-troveclient.yaml
@@ -25,3 +25,5 @@ branches:
   - name: stable/pike
     location: 2.12.0
 release-notes: https://docs.openstack.org/releasenotes/python-troveclient/pike.html
+repository-settings:
+  openstack/python-troveclient: {}
diff --git a/deliverables/pike/python-vitrageclient.yaml b/deliverables/pike/python-vitrageclient.yaml
index ee1d70f2ea..75299477ce 100644
--- a/deliverables/pike/python-vitrageclient.yaml
+++ b/deliverables/pike/python-vitrageclient.yaml
@@ -21,3 +21,5 @@ releases:
     version: 1.4.0
 team: vitrage
 type: library
+repository-settings:
+  openstack/python-vitrageclient: {}
diff --git a/deliverables/pike/python-watcherclient.yaml b/deliverables/pike/python-watcherclient.yaml
index e70e92b5bf..5cd3149744 100644
--- a/deliverables/pike/python-watcherclient.yaml
+++ b/deliverables/pike/python-watcherclient.yaml
@@ -1,5 +1,5 @@
 ---
-include-pypi-link: true
+include-pypi-link: yes
 launchpad: watcher
 release-model: cycle-with-intermediary
 team: watcher
@@ -20,3 +20,5 @@ releases:
 branches:
   - name: stable/pike
     location: 1.3.0
+repository-settings:
+  openstack/python-watcherclient: {}
diff --git a/deliverables/pike/python-zaqarclient.yaml b/deliverables/pike/python-zaqarclient.yaml
index 101107a727..8f893e40d8 100644
--- a/deliverables/pike/python-zaqarclient.yaml
+++ b/deliverables/pike/python-zaqarclient.yaml
@@ -21,3 +21,5 @@ releases:
 branches:
   - name: stable/pike
     location: 1.7.0
+repository-settings:
+  openstack/python-zaqarclient: {}
diff --git a/deliverables/pike/python-zunclient.yaml b/deliverables/pike/python-zunclient.yaml
index a468a5fa76..d82cb4cbac 100644
--- a/deliverables/pike/python-zunclient.yaml
+++ b/deliverables/pike/python-zunclient.yaml
@@ -1,5 +1,5 @@
 ---
-include-pypi-link: true
+include-pypi-link: yes
 launchpad: python-zunclient
 release-model: cycle-with-intermediary
 team: zun
@@ -24,3 +24,5 @@ releases:
 branches:
   - name: stable/pike
     location: 0.4.0
+repository-settings:
+  openstack/python-zunclient: {}
diff --git a/deliverables/pike/requestsexceptions.yaml b/deliverables/pike/requestsexceptions.yaml
index fa79a192bd..83ba5490e9 100644
--- a/deliverables/pike/requestsexceptions.yaml
+++ b/deliverables/pike/requestsexceptions.yaml
@@ -1,5 +1,5 @@
 ---
-include-pypi-link: true
+include-pypi-link: yes
 release-model: cycle-with-intermediary
 storyboard: 835
 team: OpenStackSDK
@@ -9,8 +9,10 @@ releases:
     projects:
       - repo: openstack-infra/requestsexceptions
         hash: d7ac0ff7ca9efcc1624aae0a2431e0a5862b069f
-    highlights: >
+    highlights: |
       Updated requirements to avoid a conflict with other OpenStack libs.
 branches:
   - name: stable/pike
     location: 1.3.0
+repository-settings:
+  openstack-infra/requestsexceptions: {}
diff --git a/deliverables/pike/requirements.yaml b/deliverables/pike/requirements.yaml
index 412ac2d61c..bd5a48577f 100644
--- a/deliverables/pike/requirements.yaml
+++ b/deliverables/pike/requirements.yaml
@@ -15,3 +15,5 @@ releases:
       - repo: openstack/requirements
         hash: f5ce4279b968d04674ea32052cfe83f9a1aaddb8
         tarball-base: openstack_requirements
+repository-settings:
+  openstack/requirements: {}
diff --git a/deliverables/pike/sahara.yaml b/deliverables/pike/sahara.yaml
index e1b306aa6b..61813e621a 100644
--- a/deliverables/pike/sahara.yaml
+++ b/deliverables/pike/sahara.yaml
@@ -69,3 +69,8 @@ releases:
         hash: 79369e39e40e1d9ba1cbca6039a3a06afbaf1685
     version: 7.0.0
 release-notes: https://docs.openstack.org/releasenotes/sahara/pike.html
+repository-settings:
+  openstack/sahara: {}
+  openstack/sahara-dashboard: {}
+  openstack/sahara-extra: {}
+  openstack/sahara-image-elements: {}
diff --git a/deliverables/pike/searchlight-ui.yaml b/deliverables/pike/searchlight-ui.yaml
index 96035260e2..177af4cb4a 100644
--- a/deliverables/pike/searchlight-ui.yaml
+++ b/deliverables/pike/searchlight-ui.yaml
@@ -29,3 +29,5 @@ releases:
       - repo: openstack/searchlight-ui
         hash: d52e632bf73e4e781599cf10f8ea136c90a35726
     version: 3.0.0
+repository-settings:
+  openstack/searchlight-ui: {}
diff --git a/deliverables/pike/searchlight.yaml b/deliverables/pike/searchlight.yaml
index f210094b3d..60fc3e297b 100644
--- a/deliverables/pike/searchlight.yaml
+++ b/deliverables/pike/searchlight.yaml
@@ -29,3 +29,5 @@ releases:
         hash: a1953b7f143f3bad0928b94c1370e292de93e601
     version: 3.0.0
 release-notes: https://docs.openstack.org/releasenotes/searchlight/pike.html
+repository-settings:
+  openstack/searchlight: {}
diff --git a/deliverables/pike/senlin-dashboard.yaml b/deliverables/pike/senlin-dashboard.yaml
index 76085556fd..5bfbe64056 100644
--- a/deliverables/pike/senlin-dashboard.yaml
+++ b/deliverables/pike/senlin-dashboard.yaml
@@ -13,3 +13,5 @@ releases:
       - repo: openstack/senlin-dashboard
         hash: 66a1bb79f3578ab19f7eb2bbaeb312df9c259cdf
 release-notes: https://docs.openstack.org/releasenotes/senlin-dashboard/pike.html
+repository-settings:
+  openstack/senlin-dashboard: {}
diff --git a/deliverables/pike/senlin.yaml b/deliverables/pike/senlin.yaml
index eeaa59f09f..782719acbb 100644
--- a/deliverables/pike/senlin.yaml
+++ b/deliverables/pike/senlin.yaml
@@ -29,3 +29,5 @@ branches:
   - location: 4.0.0.0rc1
     name: stable/pike
 release-notes: https://docs.openstack.org/releasenotes/senlin/pike.html
+repository-settings:
+  openstack/senlin: {}
diff --git a/deliverables/pike/shade.yaml b/deliverables/pike/shade.yaml
index a2063ecf21..00f4f6db93 100644
--- a/deliverables/pike/shade.yaml
+++ b/deliverables/pike/shade.yaml
@@ -50,3 +50,5 @@ releases:
 storyboard: 760
 team: OpenStackSDK
 type: library
+repository-settings:
+  openstack-infra/shade: {}
diff --git a/deliverables/pike/solum-dashboard.yaml b/deliverables/pike/solum-dashboard.yaml
index eb5587bf89..7230ef9c25 100644
--- a/deliverables/pike/solum-dashboard.yaml
+++ b/deliverables/pike/solum-dashboard.yaml
@@ -15,3 +15,5 @@ releases:
     projects:
       - repo: openstack/solum-dashboard
         hash: ba9037d3310af3febd6fe256d376ac80123b4fa8
+repository-settings:
+  openstack/solum-dashboard: {}
diff --git a/deliverables/pike/solum.yaml b/deliverables/pike/solum.yaml
index dcedf52d2e..4f7a6d7f18 100644
--- a/deliverables/pike/solum.yaml
+++ b/deliverables/pike/solum.yaml
@@ -16,3 +16,5 @@ releases:
       - repo: openstack/solum
         hash: a327ef08a15e97a445ee895da627039d885d2c95
 release-notes: https://docs.openstack.org/releasenotes/solum/pike.html
+repository-settings:
+  openstack/solum: {}
diff --git a/deliverables/pike/stevedore.yaml b/deliverables/pike/stevedore.yaml
index 1854f58be8..fede566405 100644
--- a/deliverables/pike/stevedore.yaml
+++ b/deliverables/pike/stevedore.yaml
@@ -33,3 +33,5 @@ releases:
     version: 1.25.1
 team: oslo
 type: library
+repository-settings:
+  openstack/stevedore: {}
diff --git a/deliverables/pike/sushy.yaml b/deliverables/pike/sushy.yaml
index 1abb72f4cf..ca40e6ff9e 100644
--- a/deliverables/pike/sushy.yaml
+++ b/deliverables/pike/sushy.yaml
@@ -24,3 +24,5 @@ branches:
   - name: stable/pike
     location: 1.0.0
 release-notes: https://docs.openstack.org/releasenotes/sushy/pike.html
+repository-settings:
+  openstack/sushy: {}
diff --git a/deliverables/pike/swift.yaml b/deliverables/pike/swift.yaml
index ccd11790b7..8069dfe27f 100644
--- a/deliverables/pike/swift.yaml
+++ b/deliverables/pike/swift.yaml
@@ -26,3 +26,5 @@ releases:
     projects:
       - repo: openstack/swift
         hash: 1f751a797997e241d5cc9a32b9307e3b9f0df4c3
+repository-settings:
+  openstack/swift: {}
diff --git a/deliverables/pike/tacker-horizon.yaml b/deliverables/pike/tacker-horizon.yaml
index 4bc8c93974..72d815f222 100644
--- a/deliverables/pike/tacker-horizon.yaml
+++ b/deliverables/pike/tacker-horizon.yaml
@@ -15,3 +15,5 @@ releases:
     projects:
       - repo: openstack/tacker-horizon
         hash: 6bdb8a4f91bf28a639fea5bb38729f8c68d17606
+repository-settings:
+  openstack/tacker-horizon: {}
diff --git a/deliverables/pike/tacker.yaml b/deliverables/pike/tacker.yaml
index d9815e324e..751e32ddde 100644
--- a/deliverables/pike/tacker.yaml
+++ b/deliverables/pike/tacker.yaml
@@ -16,3 +16,5 @@ releases:
       - repo: openstack/tacker
         hash: 90f5374f73ea8dd5f41c9ca8f2ed447d5a37285a
 release-notes: https://docs.openstack.org/releasenotes/tacker/pike.html
+repository-settings:
+  openstack/tacker: {}
diff --git a/deliverables/pike/taskflow.yaml b/deliverables/pike/taskflow.yaml
index d1340b500d..8090f63e19 100644
--- a/deliverables/pike/taskflow.yaml
+++ b/deliverables/pike/taskflow.yaml
@@ -33,3 +33,5 @@ releases:
     version: 2.14.1
 team: oslo
 type: library
+repository-settings:
+  openstack/taskflow: {}
diff --git a/deliverables/pike/tempest.yaml b/deliverables/pike/tempest.yaml
index df76783823..02e874df27 100644
--- a/deliverables/pike/tempest.yaml
+++ b/deliverables/pike/tempest.yaml
@@ -1,8 +1,8 @@
 ---
-include-pypi-link: true
+include-pypi-link: yes
 launchpad: tempest
 release-model: cycle-with-intermediary
-team: Quality Assurance
+team: 'Quality Assurance'
 type: other
 releases:
   - version: 16.0.0
@@ -17,3 +17,5 @@ releases:
     projects:
       - repo: openstack/tempest
         hash: ad75393a990e0bd6cfa694d554b43136216db03b
+repository-settings:
+  openstack/tempest: {}
diff --git a/deliverables/pike/tooz.yaml b/deliverables/pike/tooz.yaml
index b921450773..fc1bb99d3b 100644
--- a/deliverables/pike/tooz.yaml
+++ b/deliverables/pike/tooz.yaml
@@ -69,3 +69,5 @@ releases:
     version: 1.58.0
 team: oslo
 type: library
+repository-settings:
+  openstack/tooz: {}
diff --git a/deliverables/pike/tosca-parser.yaml b/deliverables/pike/tosca-parser.yaml
index e32f9b26ae..b44ac44050 100644
--- a/deliverables/pike/tosca-parser.yaml
+++ b/deliverables/pike/tosca-parser.yaml
@@ -16,3 +16,5 @@ releases:
 branches:
   - name: stable/pike
     location: 0.8.1
+repository-settings:
+  openstack/tosca-parser: {}
diff --git a/deliverables/pike/tricircle.yaml b/deliverables/pike/tricircle.yaml
index 731951a411..8a9fafb4a2 100644
--- a/deliverables/pike/tricircle.yaml
+++ b/deliverables/pike/tricircle.yaml
@@ -29,3 +29,5 @@ releases:
 branches:
   - location: 4.0.0
     name: stable/pike
+repository-settings:
+  openstack/tricircle: {}
diff --git a/deliverables/pike/tripleo-common.yaml b/deliverables/pike/tripleo-common.yaml
index 9a439fa985..2738d8be98 100644
--- a/deliverables/pike/tripleo-common.yaml
+++ b/deliverables/pike/tripleo-common.yaml
@@ -73,3 +73,5 @@ releases:
 team: tripleo
 type: other
 release-notes: https://docs.openstack.org/releasenotes/tripleo-common/pike.html
+repository-settings:
+  openstack/tripleo-common: {}
diff --git a/deliverables/pike/tripleo-heat-templates.yaml b/deliverables/pike/tripleo-heat-templates.yaml
index f46ba6adec..73dd5d250d 100644
--- a/deliverables/pike/tripleo-heat-templates.yaml
+++ b/deliverables/pike/tripleo-heat-templates.yaml
@@ -66,3 +66,5 @@ releases:
 team: tripleo
 type: other
 release-notes: https://docs.openstack.org/releasenotes/tripleo-heat-templates/pike.html
+repository-settings:
+  openstack/tripleo-heat-templates: {}
diff --git a/deliverables/pike/tripleo-image-elements.yaml b/deliverables/pike/tripleo-image-elements.yaml
index ecfef3cb66..f9337fc126 100644
--- a/deliverables/pike/tripleo-image-elements.yaml
+++ b/deliverables/pike/tripleo-image-elements.yaml
@@ -42,3 +42,5 @@ releases:
 team: tripleo
 type: other
 release-notes: https://docs.openstack.org/releasenotes/tripleo-image-elements/pike.html
+repository-settings:
+  openstack/tripleo-image-elements: {}
diff --git a/deliverables/pike/tripleo-puppet-elements.yaml b/deliverables/pike/tripleo-puppet-elements.yaml
index fd4a7153dd..f6458ea3d8 100644
--- a/deliverables/pike/tripleo-puppet-elements.yaml
+++ b/deliverables/pike/tripleo-puppet-elements.yaml
@@ -50,3 +50,5 @@ releases:
 team: tripleo
 type: other
 release-notes: https://docs.openstack.org/releasenotes/tripleo-puppet-elements/pike.html
+repository-settings:
+  openstack/tripleo-puppet-elements: {}
diff --git a/deliverables/pike/tripleo-quickstart.yaml b/deliverables/pike/tripleo-quickstart.yaml
index 8230f532e2..ef88754123 100644
--- a/deliverables/pike/tripleo-quickstart.yaml
+++ b/deliverables/pike/tripleo-quickstart.yaml
@@ -10,3 +10,6 @@ releases:
         hash: 797cae92c1921f0bb1617949049e3685af016014
       - repo: openstack/tripleo-quickstart-extras
         hash: dd96d343cefb7e6bbd17128fb89c9211b1406c86
+repository-settings:
+  openstack/tripleo-quickstart: {}
+  openstack/tripleo-quickstart-extras: {}
diff --git a/deliverables/pike/tripleo-ui.yaml b/deliverables/pike/tripleo-ui.yaml
index b85832d9ec..257396eee9 100644
--- a/deliverables/pike/tripleo-ui.yaml
+++ b/deliverables/pike/tripleo-ui.yaml
@@ -57,3 +57,5 @@ releases:
 team: tripleo
 type: other
 release-notes: https://docs.openstack.org/releasenotes/tripleo-ui/pike.html
+repository-settings:
+  openstack/tripleo-ui: {}
diff --git a/deliverables/pike/tripleo-validations.yaml b/deliverables/pike/tripleo-validations.yaml
index a8ce5bdd71..b0c4ac996a 100644
--- a/deliverables/pike/tripleo-validations.yaml
+++ b/deliverables/pike/tripleo-validations.yaml
@@ -53,3 +53,5 @@ releases:
 team: tripleo
 type: other
 release-notes: https://docs.openstack.org/releasenotes/tripleo-validations/pike.html
+repository-settings:
+  openstack/tripleo-validations: {}
diff --git a/deliverables/pike/trove-dashboard.yaml b/deliverables/pike/trove-dashboard.yaml
index 971b7b076a..8fd2a0ae2c 100644
--- a/deliverables/pike/trove-dashboard.yaml
+++ b/deliverables/pike/trove-dashboard.yaml
@@ -29,3 +29,5 @@ releases:
         hash: 387c3358555ee539f7abbbf4875497497e12c265
     version: 9.0.0
 release-notes: https://docs.openstack.org/releasenotes/trove-dashboard/pike.html
+repository-settings:
+  openstack/trove-dashboard: {}
diff --git a/deliverables/pike/trove.yaml b/deliverables/pike/trove.yaml
index 66d75ccbae..ad89724969 100644
--- a/deliverables/pike/trove.yaml
+++ b/deliverables/pike/trove.yaml
@@ -29,3 +29,5 @@ releases:
         hash: 0fb67d459baa0fb22391b1b1da3dba5349666bb7
     version: 8.0.0
 release-notes: https://docs.openstack.org/releasenotes/trove/pike.html
+repository-settings:
+  openstack/trove: {}
diff --git a/deliverables/pike/vitrage-dashboard.yaml b/deliverables/pike/vitrage-dashboard.yaml
index 8ecf0da069..53c7a4cb8a 100644
--- a/deliverables/pike/vitrage-dashboard.yaml
+++ b/deliverables/pike/vitrage-dashboard.yaml
@@ -20,3 +20,5 @@ releases:
     projects:
       - repo: openstack/vitrage-dashboard
         hash: 3ab435fa6b76c16c552a6cf95b4e16cc29499c13
+repository-settings:
+  openstack/vitrage-dashboard: {}
diff --git a/deliverables/pike/vitrage.yaml b/deliverables/pike/vitrage.yaml
index bfa4598245..75d000ccc2 100644
--- a/deliverables/pike/vitrage.yaml
+++ b/deliverables/pike/vitrage.yaml
@@ -29,3 +29,5 @@ releases:
     projects:
       - repo: openstack/vitrage
         hash: b0400e0322415df4402bae8092b9b2a1d2f79d11
+repository-settings:
+  openstack/vitrage: {}
diff --git a/deliverables/pike/watcher-dashboard.yaml b/deliverables/pike/watcher-dashboard.yaml
index ae7bc13131..0d2c856ea9 100644
--- a/deliverables/pike/watcher-dashboard.yaml
+++ b/deliverables/pike/watcher-dashboard.yaml
@@ -25,3 +25,5 @@ releases:
       - repo: openstack/watcher-dashboard
         hash: 2e7f77ad48e9f231adaa11696af23962219c014e
 release-notes: https://docs.openstack.org/releasenotes/watcher-dashboard/pike.html
+repository-settings:
+  openstack/watcher-dashboard: {}
diff --git a/deliverables/pike/watcher.yaml b/deliverables/pike/watcher.yaml
index cb8397a7d3..2348d3316a 100644
--- a/deliverables/pike/watcher.yaml
+++ b/deliverables/pike/watcher.yaml
@@ -33,3 +33,5 @@ releases:
       - repo: openstack/watcher
         hash: 9d2f8d11ec5bd633af6b9d5b4bb506c68f38bc4d
         tarball-base: python-watcher
+repository-settings:
+  openstack/watcher: {}
diff --git a/deliverables/pike/zaqar-ui.yaml b/deliverables/pike/zaqar-ui.yaml
index 68777a1727..7c68516440 100644
--- a/deliverables/pike/zaqar-ui.yaml
+++ b/deliverables/pike/zaqar-ui.yaml
@@ -30,3 +30,5 @@ releases:
 branches:
   - location: 3.0.0.0rc1
     name: stable/pike
+repository-settings:
+  openstack/zaqar-ui: {}
diff --git a/deliverables/pike/zaqar.yaml b/deliverables/pike/zaqar.yaml
index e6a7cb579a..055945785a 100644
--- a/deliverables/pike/zaqar.yaml
+++ b/deliverables/pike/zaqar.yaml
@@ -29,3 +29,5 @@ releases:
 branches:
   - location: 5.0.0.0rc1
     name: stable/pike
+repository-settings:
+  openstack/zaqar: {}
diff --git a/deliverables/pike/zun-ui.yaml b/deliverables/pike/zun-ui.yaml
index 2bab046a39..4b0584f701 100644
--- a/deliverables/pike/zun-ui.yaml
+++ b/deliverables/pike/zun-ui.yaml
@@ -16,3 +16,5 @@ releases:
       - repo: openstack/zun-ui
         hash: 7561c1b6aed9399980da3f9560e968b3dc97bc6a
 release-notes: https://docs.openstack.org/releasenotes/zun-ui/pike.html
+repository-settings:
+  openstack/zun-ui: {}
diff --git a/deliverables/pike/zun.yaml b/deliverables/pike/zun.yaml
index 344e2411e8..cb65660c18 100644
--- a/deliverables/pike/zun.yaml
+++ b/deliverables/pike/zun.yaml
@@ -19,3 +19,5 @@ releases:
     projects:
       - repo: openstack/zun
         hash: ee968441aa4ec31b8e7f34b35377124ade4933fe
+repository-settings:
+  openstack/zun: {}