diff --git a/deliverables/_independent/bandit.yaml b/deliverables/_independent/bandit.yaml
index e728ae3888..4e684716c7 100644
--- a/deliverables/_independent/bandit.yaml
+++ b/deliverables/_independent/bandit.yaml
@@ -2,7 +2,6 @@
 launchpad: bandit
 team: Security
 type: other
-send-announcements-to: openstack-dev@lists.openstack.org
 include-pypi-link: yes
 releases:
   - version: 0.9.0
@@ -85,7 +84,7 @@ releases:
     projects:
       - repo: openstack/bandit
         hash: 71df005d14235e57f8deda538177361182f36f63
-  - version: 1.0
+  - version: "1.0"
     projects:
       - repo: openstack/bandit
         hash: d653e969aedba3f44674de26afaa57309de3b389
diff --git a/deliverables/_independent/castellan.yaml b/deliverables/_independent/castellan.yaml
index aeda3883af..da31d67b9a 100644
--- a/deliverables/_independent/castellan.yaml
+++ b/deliverables/_independent/castellan.yaml
@@ -2,7 +2,6 @@
 launchpad: castellan
 team: barbican
 type: library
-send-announcements-to: openstack-dev@lists.openstack.org
 branches:
   - name: stable/ocata
     location: 0.5.0
diff --git a/deliverables/_independent/designate-tempest-plugin.yaml b/deliverables/_independent/designate-tempest-plugin.yaml
index eb4468811c..4dac4e9e07 100644
--- a/deliverables/_independent/designate-tempest-plugin.yaml
+++ b/deliverables/_independent/designate-tempest-plugin.yaml
@@ -2,7 +2,6 @@
 launchpad: designate
 team: designate
 type: other
-send-announcements-to: openstack-dev@lists.openstack.org
 include-pypi-link: yes
 releases:
   - version: 0.1.0
diff --git a/deliverables/_independent/diskimage-builder.yaml b/deliverables/_independent/diskimage-builder.yaml
index 5d0679e00c..0a873ae952 100644
--- a/deliverables/_independent/diskimage-builder.yaml
+++ b/deliverables/_independent/diskimage-builder.yaml
@@ -2,7 +2,6 @@
 launchpad: diskimage-builder
 team: tripleo
 type: other
-send-announcements-to: openstack-dev@lists.openstack.org
 releases:
   - version: 0.0.1
     projects:
diff --git a/deliverables/_independent/django-openstack-auth-kerberos.yaml b/deliverables/_independent/django-openstack-auth-kerberos.yaml
index 7f5bf7089e..f02fcaf63e 100644
--- a/deliverables/_independent/django-openstack-auth-kerberos.yaml
+++ b/deliverables/_independent/django-openstack-auth-kerberos.yaml
@@ -2,7 +2,10 @@
 launchpad: django-openstack-auth-kerberos
 team: horizon
 type: library
-send-announcements-to: openstack-dev@lists.openstack.org
+repository-settings:
+  openstack/django-openstack-auth-kerberos:
+    flags:
+      - retired
 releases:
   - version: 0.2.0
     projects:
diff --git a/deliverables/_independent/doc8.yaml b/deliverables/_independent/doc8.yaml
index 43af544a2f..dcd54e15fd 100644
--- a/deliverables/_independent/doc8.yaml
+++ b/deliverables/_independent/doc8.yaml
@@ -1,8 +1,6 @@
 ---
 include-pypi-link: true
 launchpad: doc8
-release-model: independent
-send-announcements-to: openstack-announce@lists.openstack.org
 team: Documentation
 type: other
 releases:
diff --git a/deliverables/_independent/dragonflow.yaml b/deliverables/_independent/dragonflow.yaml
index f14f017d7d..80930f254d 100644
--- a/deliverables/_independent/dragonflow.yaml
+++ b/deliverables/_independent/dragonflow.yaml
@@ -2,7 +2,6 @@
 launchpad: dragonflow
 team: dragonflow
 type: other
-send-announcements-to: openstack-announce@lists.openstack.org
 branches:
   - name: stable/newton
     location: 2.0.0
diff --git a/deliverables/_independent/fairy-slipper.yaml b/deliverables/_independent/fairy-slipper.yaml
index ecb4853ec4..3e1dcb8e93 100644
--- a/deliverables/_independent/fairy-slipper.yaml
+++ b/deliverables/_independent/fairy-slipper.yaml
@@ -1,8 +1,12 @@
 ---
 launchpad: openstack-doc-tools
 team: Documentation
-send-announcements-to: openstack-dev@lists.openstack.org
 release-notes: http://docs.openstack.org/releasenotes/fairy-slipper/
+type: other
+repository-settings:
+  openstack/fairy-slipper:
+    flags:
+      - retired
 releases:
   - version: 0.1.0
     projects:
diff --git a/deliverables/_independent/gnocchi.yaml b/deliverables/_independent/gnocchi.yaml
index fd9ff951b8..5b09822b3d 100644
--- a/deliverables/_independent/gnocchi.yaml
+++ b/deliverables/_independent/gnocchi.yaml
@@ -2,10 +2,13 @@
 launchpad: gnocchi
 team: Telemetry
 type: other
-send-announcements-to: openstack-announce@lists.openstack.org
 branches:
   - name: stable/3.1
     location: 3.1.0
+repository-settings:
+  openstack/gnocchi:
+    flags:
+      - retired
 releases:
   - version: 1.0.0a1
     projects:
diff --git a/deliverables/_independent/hacking.yaml b/deliverables/_independent/hacking.yaml
index c4975d596a..fea39e640d 100644
--- a/deliverables/_independent/hacking.yaml
+++ b/deliverables/_independent/hacking.yaml
@@ -2,7 +2,6 @@
 launchpad: hacking
 team: Quality Assurance
 type: other
-send-announcements-to: openstack-dev@lists.openstack.org
 include-pypi-link: yes
 releases:
   - version: 0.5.0
diff --git a/deliverables/_independent/heat-translator.yaml b/deliverables/_independent/heat-translator.yaml
index 1b22202f28..096f9fbaa2 100644
--- a/deliverables/_independent/heat-translator.yaml
+++ b/deliverables/_independent/heat-translator.yaml
@@ -1,10 +1,8 @@
 ---
 include-pypi-link: yes
 launchpad: heat-translator
-release-model: independent
 team: heat
 type: library
-send-announcements-to: openstack-announce@lists.openstack.org
 releases:
   - version: 0.1.0
     projects:
diff --git a/deliverables/_independent/instack.yaml b/deliverables/_independent/instack.yaml
index 6cd8f327c3..9f853db9c7 100644
--- a/deliverables/_independent/instack.yaml
+++ b/deliverables/_independent/instack.yaml
@@ -2,7 +2,6 @@
 launchpad: tripleo
 team: tripleo
 type: library
-send-announcements-to: openstack-dev@lists.openstack.org
 releases:
   - version: 0.0.7
     projects:
diff --git a/deliverables/_independent/ironic-lib.yaml b/deliverables/_independent/ironic-lib.yaml
index afaa81888c..e08c5823c9 100644
--- a/deliverables/_independent/ironic-lib.yaml
+++ b/deliverables/_independent/ironic-lib.yaml
@@ -2,7 +2,6 @@
 launchpad: ironic-lib
 team: ironic
 type: library
-send-announcements-to: openstack-dev@lists.openstack.org
 releases:
   - version: 0.1.0
     projects:
diff --git a/deliverables/_independent/karbor-dashboard.yaml b/deliverables/_independent/karbor-dashboard.yaml
index 951767ce18..36ef39bd3d 100644
--- a/deliverables/_independent/karbor-dashboard.yaml
+++ b/deliverables/_independent/karbor-dashboard.yaml
@@ -1,10 +1,8 @@
 ---
 include-pypi-link: true
 launchpad: karbor-dashboard
-release-model: independent
 team: karbor
 type: horizon-plugin
-send-announcements-to: openstack-announce@lists.openstack.org
 branches:
   - name: stable/ocata
     location: 0.1.2
diff --git a/deliverables/_independent/karbor.yaml b/deliverables/_independent/karbor.yaml
index 2e3506cb0e..3632fe1d76 100644
--- a/deliverables/_independent/karbor.yaml
+++ b/deliverables/_independent/karbor.yaml
@@ -2,7 +2,6 @@
 launchpad: karbor
 team: karbor
 type: service
-send-announcements-to: openstack-announce@lists.openstack.org
 branches:
   - name: stable/ocata
     location: 0.2.0
diff --git a/deliverables/_independent/kolla-kubernetes.yaml b/deliverables/_independent/kolla-kubernetes.yaml
index 6d9c696dc0..2b5293a42e 100644
--- a/deliverables/_independent/kolla-kubernetes.yaml
+++ b/deliverables/_independent/kolla-kubernetes.yaml
@@ -3,7 +3,6 @@ launchpad: kolla-kubernetes
 team: kolla
 type: other
 release-notes: https://docs.openstack.org/releasenotes/kolla-kubernetes/
-send-announcements-to: openstack-announce@lists.openstack.org
 releases:
   - version: 0.1.0
     projects:
diff --git a/deliverables/_independent/kolla.yaml b/deliverables/_independent/kolla.yaml
index 780fa4a824..5d23d26726 100644
--- a/deliverables/_independent/kolla.yaml
+++ b/deliverables/_independent/kolla.yaml
@@ -3,7 +3,6 @@ launchpad: kolla
 team: kolla
 type: other
 release-notes: https://docs.openstack.org/releasenotes/kolla/mitaka.html
-send-announcements-to: openstack-announce@lists.openstack.org
 releases:
   # - version: 1.0.0
   #   projects:
diff --git a/deliverables/_independent/kuryr-libnetwork.yaml b/deliverables/_independent/kuryr-libnetwork.yaml
index 75052e285b..ea3516ef21 100644
--- a/deliverables/_independent/kuryr-libnetwork.yaml
+++ b/deliverables/_independent/kuryr-libnetwork.yaml
@@ -2,8 +2,6 @@
 launchpad: kuryr-libnetwork
 team: kuryr
 type: service
-release-model: independent
-send-announcements-to: openstack-announce@lists.openstack.org
 releases:
   - version: 0.1.0
     projects:
diff --git a/deliverables/_independent/kuryr.yaml b/deliverables/_independent/kuryr.yaml
index 5716556d92..45f25eb726 100644
--- a/deliverables/_independent/kuryr.yaml
+++ b/deliverables/_independent/kuryr.yaml
@@ -2,7 +2,6 @@
 launchpad: kuryr
 team: kuryr
 type: library
-send-announcements-to: openstack-announce@lists.openstack.org
 releases:
   - version: 0.1.0
     projects:
diff --git a/deliverables/_independent/monasca-grafana-datasource.yaml b/deliverables/_independent/monasca-grafana-datasource.yaml
index fd039e4a39..8ad04a0b03 100644
--- a/deliverables/_independent/monasca-grafana-datasource.yaml
+++ b/deliverables/_independent/monasca-grafana-datasource.yaml
@@ -1,8 +1,6 @@
 ---
 launchpad: monasca
 team: monasca
-send-announcements-to: openstack-announce@lists.openstack.org
-release-model: independent
 type: other
 releases:
   - version: 1.0.0
diff --git a/deliverables/_independent/murano-pkg-check.yaml b/deliverables/_independent/murano-pkg-check.yaml
index 132bf64c2e..f288a369e2 100644
--- a/deliverables/_independent/murano-pkg-check.yaml
+++ b/deliverables/_independent/murano-pkg-check.yaml
@@ -2,7 +2,6 @@
 launchpad: murano
 team: murano
 type: other
-send-announcements-to: openstack-dev@lists.openstack.org
 include-pypi-link: yes
 releases:
   - version: 0.1.0
diff --git a/deliverables/_independent/networking-ale-omniswitch.yaml b/deliverables/_independent/networking-ale-omniswitch.yaml
index 30d2a79ee1..83ad5c4d9b 100644
--- a/deliverables/_independent/networking-ale-omniswitch.yaml
+++ b/deliverables/_independent/networking-ale-omniswitch.yaml
@@ -2,7 +2,6 @@
 launchpad: networking-ale-omniswitch
 team: neutron
 type: other
-send-announcements-to: openstack-announce@lists.openstack.org
 releases:
   - version: 1.0.0
     projects:
diff --git a/deliverables/_independent/networking-arista.yaml b/deliverables/_independent/networking-arista.yaml
index ac6ea5f523..ed2c1c83b8 100644
--- a/deliverables/_independent/networking-arista.yaml
+++ b/deliverables/_independent/networking-arista.yaml
@@ -1,9 +1,10 @@
 ---
 launchpad: networking-arista
 team: neutron
-send-announcements-to: openstack-announce@lists.openstack.org
+type: other
 releases:
   - version: 2015.1.5
     projects:
       - repo: openstack/networking-arista
         hash: 4f2e72515f66262c356e5eff51e1b3c86b733c31
+        tarball-base: networking_arista
diff --git a/deliverables/_independent/networking-bagpipe.yaml b/deliverables/_independent/networking-bagpipe.yaml
index bad8a1157f..314ba37fc7 100644
--- a/deliverables/_independent/networking-bagpipe.yaml
+++ b/deliverables/_independent/networking-bagpipe.yaml
@@ -2,7 +2,6 @@
 launchpad: networking-bagpipe
 team: neutron
 type: other
-send-announcements-to: openstack-announce@lists.openstack.org
 release-notes: https://docs.openstack.org/releasenotes/networking-bagpipe
 releases:
   - version: 4.0.0
diff --git a/deliverables/_independent/networking-bgpvpn.yaml b/deliverables/_independent/networking-bgpvpn.yaml
index e51183cc1c..665d546bfc 100644
--- a/deliverables/_independent/networking-bgpvpn.yaml
+++ b/deliverables/_independent/networking-bgpvpn.yaml
@@ -2,7 +2,6 @@
 launchpad: bgpvpn
 team: neutron
 type: other
-send-announcements-to: openstack-announce@lists.openstack.org
 release-notes: https://docs.openstack.org/releasenotes/networking-bgpvpn
 releases:
   - version: 3.0.0
diff --git a/deliverables/_independent/networking-calico.yaml b/deliverables/_independent/networking-calico.yaml
index a2715114df..d14b7d8cc7 100644
--- a/deliverables/_independent/networking-calico.yaml
+++ b/deliverables/_independent/networking-calico.yaml
@@ -2,7 +2,6 @@
 launchpad: networking-calico
 team: neutron
 type: other
-send-announcements-to: openstack-announce@lists.openstack.org
 releases:
   - version: 1.0.0
     projects:
diff --git a/deliverables/_independent/networking-cisco.yaml b/deliverables/_independent/networking-cisco.yaml
index 89cb35058b..856d8c13db 100644
--- a/deliverables/_independent/networking-cisco.yaml
+++ b/deliverables/_independent/networking-cisco.yaml
@@ -2,7 +2,6 @@
 launchpad: networking-cisco
 team: neutron
 type: other
-send-announcements-to: openstack-announce@lists.openstack.org
 releases:
   - version: 1.0.0
     projects:
diff --git a/deliverables/_independent/networking-midonet.yaml b/deliverables/_independent/networking-midonet.yaml
index 3fb1a57b60..754e4bbe0a 100644
--- a/deliverables/_independent/networking-midonet.yaml
+++ b/deliverables/_independent/networking-midonet.yaml
@@ -2,7 +2,6 @@
 launchpad: networking-midonet
 team: neutron
 type: other
-send-announcements-to: openstack-announce@lists.openstack.org
 release-notes: https://docs.openstack.org/releasenotes/networking-midonet/
 releases:
   # liberty
diff --git a/deliverables/_independent/networking-odl.yaml b/deliverables/_independent/networking-odl.yaml
index e98a284e20..bbe3ae9ebb 100644
--- a/deliverables/_independent/networking-odl.yaml
+++ b/deliverables/_independent/networking-odl.yaml
@@ -2,7 +2,6 @@
 launchpad: networking-odl
 team: neutron
 type: other
-send-announcements-to: openstack-announce@lists.openstack.org
 release-notes: https://docs.openstack.org/releasenotes/networking-odl/
 include-pypi-link: yes
 releases:
diff --git a/deliverables/_independent/networking-ofagent.yaml b/deliverables/_independent/networking-ofagent.yaml
index 04627f3fca..e81e833149 100644
--- a/deliverables/_independent/networking-ofagent.yaml
+++ b/deliverables/_independent/networking-ofagent.yaml
@@ -2,7 +2,10 @@
 launchpad: networking-ofagent
 team: neutron
 type: other
-send-announcements-to: openstack-announce@lists.openstack.org
+repository-settings:
+  openstack/networking-ofagent:
+    flags:
+      - retired
 releases:
   # kilo
   - version: 2015.1.6
diff --git a/deliverables/_independent/networking-onos.yaml b/deliverables/_independent/networking-onos.yaml
index 50d0f5adfe..fcec341b71 100644
--- a/deliverables/_independent/networking-onos.yaml
+++ b/deliverables/_independent/networking-onos.yaml
@@ -2,7 +2,6 @@
 launchpad: networking-onos
 team: neutron
 type: other
-send-announcements-to: openstack-announce@lists.openstack.org
 releases:
   - version: 1.0.0
     projects:
diff --git a/deliverables/_independent/networking-sfc.yaml b/deliverables/_independent/networking-sfc.yaml
index 11a5b2df8b..0f9d770f25 100644
--- a/deliverables/_independent/networking-sfc.yaml
+++ b/deliverables/_independent/networking-sfc.yaml
@@ -2,7 +2,6 @@
 launchpad: networking-sfc
 team: neutron
 type: other
-send-announcements-to: openstack-announce@lists.openstack.org
 release-notes: https://docs.openstack.org/releasenotes/networking-sfc/
 branches:
   - name: stable/mitaka
diff --git a/deliverables/_independent/networking-vsphere.yaml b/deliverables/_independent/networking-vsphere.yaml
index 39472cc13e..f8e2e6534c 100644
--- a/deliverables/_independent/networking-vsphere.yaml
+++ b/deliverables/_independent/networking-vsphere.yaml
@@ -2,7 +2,6 @@
 launchpad: networking-vsphere
 team: neutron
 type: other
-send-announcements-to: openstack-announce@lists.openstack.org
 releases:
   - version: 1.0.0
     projects:
diff --git a/deliverables/_independent/neutron-lbaas-dashboard.yaml b/deliverables/_independent/neutron-lbaas-dashboard.yaml
index c2fb73ecf9..cda7b3ea90 100644
--- a/deliverables/_independent/neutron-lbaas-dashboard.yaml
+++ b/deliverables/_independent/neutron-lbaas-dashboard.yaml
@@ -1,10 +1,8 @@
 ---
 include-pypi-link: true
 launchpad: neutron-lbaas-dashboard
-release-model: independent
 team: octavia
 type: horizon-plugin
-send-announcements-to: openstack-announce@lists.openstack.org
 branches:
   - name: stable/ocata
     location: 2.0.0
diff --git a/deliverables/_independent/openstack-ansible.yaml b/deliverables/_independent/openstack-ansible.yaml
index 97d375aefe..a6f1ad6646 100644
--- a/deliverables/_independent/openstack-ansible.yaml
+++ b/deliverables/_independent/openstack-ansible.yaml
@@ -2,7 +2,6 @@
 launchpad: openstack-ansible
 team: OpenStackAnsible
 type: other
-send-announcements-to: openstack-announce@lists.openstack.org
 release-notes: https://docs.openstack.org/releasenotes/openstack-ansible/
 artifact-link-mode: none
 releases:
diff --git a/deliverables/_independent/openstack-doc-tools.yaml b/deliverables/_independent/openstack-doc-tools.yaml
index d12cf31cdb..3298c20a5e 100644
--- a/deliverables/_independent/openstack-doc-tools.yaml
+++ b/deliverables/_independent/openstack-doc-tools.yaml
@@ -2,7 +2,6 @@
 launchpad: openstack-doc-tools
 team: Documentation
 type: library
-send-announcements-to: openstack-dev@lists.openstack.org
 release-notes: https://docs.openstack.org/releasenotes/openstack-doc-tools/
 releases:
   - version: 0.26.0
diff --git a/deliverables/_independent/openstack_requirements.yaml b/deliverables/_independent/openstack_requirements.yaml
index 87146c5513..f3d547b7f8 100644
--- a/deliverables/_independent/openstack_requirements.yaml
+++ b/deliverables/_independent/openstack_requirements.yaml
@@ -2,10 +2,10 @@
 launchpad: openstack-requirements
 team: requirements
 type: other
-send-announcements-to: openstack-dev@lists.openstack.org
 include-pypi-link: yes
 releases:
   - version: 1.0.0
     projects:
       - repo: openstack/requirements
         hash: 495027bda42431678845f40f084191623c7b2755
+        tarball-base: openstack_requirements
diff --git a/deliverables/_independent/openstackdocstheme.yaml b/deliverables/_independent/openstackdocstheme.yaml
index 6a6289c67a..537621c5a4 100644
--- a/deliverables/_independent/openstackdocstheme.yaml
+++ b/deliverables/_independent/openstackdocstheme.yaml
@@ -2,7 +2,6 @@
 launchpad: openstackdocstheme
 team: Documentation
 type: library
-send-announcements-to: openstack-dev@lists.openstack.org
 release-notes: https://docs.openstack.org/releasenotes/openstackdocstheme
 releases:
   - version: 1.0.8
diff --git a/deliverables/_independent/os-api-ref.yaml b/deliverables/_independent/os-api-ref.yaml
index 5632cfbadc..0e21341000 100644
--- a/deliverables/_independent/os-api-ref.yaml
+++ b/deliverables/_independent/os-api-ref.yaml
@@ -2,7 +2,6 @@
 launchpad: openstack-doc-tools
 team: Documentation
 type: library
-send-announcements-to: openstack-dev@lists.openstack.org
 release-type: std
 releases:
   - version: 0.1.0
diff --git a/deliverables/_independent/os-cloud-config.yaml b/deliverables/_independent/os-cloud-config.yaml
index 639af65183..04ccd98aed 100644
--- a/deliverables/_independent/os-cloud-config.yaml
+++ b/deliverables/_independent/os-cloud-config.yaml
@@ -2,7 +2,10 @@
 launchpad: os-cloud-config
 team: tripleo
 type: other
-send-announcements-to: openstack-dev@lists.openstack.org
+repository-settings:
+  openstack/os-cloud-config:
+    flags:
+      - retired
 releases:
   - version: 0.2.7
     projects:
diff --git a/deliverables/_independent/os-collect-config.yaml b/deliverables/_independent/os-collect-config.yaml
index 005fc93ac0..58998fbfaa 100644
--- a/deliverables/_independent/os-collect-config.yaml
+++ b/deliverables/_independent/os-collect-config.yaml
@@ -2,7 +2,6 @@
 launchpad: os-collect-config
 team: tripleo
 type: other
-send-announcements-to: openstack-dev@lists.openstack.org
 releases:
   - version: 0.1.34
     projects:
diff --git a/deliverables/_independent/os-net-config.yaml b/deliverables/_independent/os-net-config.yaml
index 470d7b6682..6bfb428105 100644
--- a/deliverables/_independent/os-net-config.yaml
+++ b/deliverables/_independent/os-net-config.yaml
@@ -2,7 +2,6 @@
 launchpad: os-net-config
 team: tripleo
 type: other
-send-announcements-to: openstack-dev@lists.openstack.org
 include-pypi-link: yes
 releases:
   - version: 0.1.4
diff --git a/deliverables/_independent/pbr.yaml b/deliverables/_independent/pbr.yaml
index edb2b13892..6c950f6703 100644
--- a/deliverables/_independent/pbr.yaml
+++ b/deliverables/_independent/pbr.yaml
@@ -2,7 +2,6 @@
 launchpad: pbr
 team: oslo
 type: library
-send-announcements-to: openstack-dev@lists.openstack.org
 include-pypi-link: yes
 releases:
   # kilo
diff --git a/deliverables/_independent/puppet-aodh.yaml b/deliverables/_independent/puppet-aodh.yaml
index a29422fbf3..6685f64480 100644
--- a/deliverables/_independent/puppet-aodh.yaml
+++ b/deliverables/_independent/puppet-aodh.yaml
@@ -3,10 +3,8 @@ launchpad: puppet-aodh
 team: Puppet OpenStack
 type: other
 release-notes:
-  7.1.0: http://git.openstack.org/cgit/openstack/puppet-aodh/tree/CHANGELOG.md?h=stable/liberty
   8.1.0: http://docs.openstack.org/releasenotes/puppet-aodh/mitaka.html
   8.2.0: http://docs.openstack.org/releasenotes/puppet-aodh/mitaka.html
-send-announcements-to: openstack-announce@lists.openstack.org
 releases:
   - version: 7.1.0
     projects:
diff --git a/deliverables/_independent/puppet-ceilometer.yaml b/deliverables/_independent/puppet-ceilometer.yaml
index a6d8caa24e..6538eadb64 100644
--- a/deliverables/_independent/puppet-ceilometer.yaml
+++ b/deliverables/_independent/puppet-ceilometer.yaml
@@ -3,10 +3,8 @@ launchpad: puppet-ceilometer
 team: Puppet OpenStack
 type: other
 release-notes:
-  7.1.0: http://git.openstack.org/cgit/openstack/puppet-ceilometer/tree/CHANGELOG.md?h=stable/liberty
   8.1.0: http://docs.openstack.org/releasenotes/puppet-ceilometer/mitaka.html
   8.2.0: http://docs.openstack.org/releasenotes/puppet-ceilometer/mitaka.html
-send-announcements-to: openstack-announce@lists.openstack.org
 releases:
   - version: 7.1.0
     projects:
diff --git a/deliverables/_independent/puppet-ceph.yaml b/deliverables/_independent/puppet-ceph.yaml
index 6cd3c871e2..6e4e54c5f3 100644
--- a/deliverables/_independent/puppet-ceph.yaml
+++ b/deliverables/_independent/puppet-ceph.yaml
@@ -1,7 +1,6 @@
 ---
 launchpad: puppet-ceph
 team: Puppet OpenStack
-release-model: independent
 type: other
 releases:
   - version: 2.3.0
diff --git a/deliverables/_independent/puppet-cinder.yaml b/deliverables/_independent/puppet-cinder.yaml
index 7bb4c56aa9..387c77ff5b 100644
--- a/deliverables/_independent/puppet-cinder.yaml
+++ b/deliverables/_independent/puppet-cinder.yaml
@@ -3,10 +3,8 @@ launchpad: puppet-cinder
 team: Puppet OpenStack
 type: other
 release-notes:
-  7.1.0: http://git.openstack.org/cgit/openstack/puppet-cinder/tree/CHANGELOG.md?h=stable/liberty
   8.1.0: http://docs.openstack.org/releasenotes/puppet-cinder/mitaka.html
   8.2.0: http://docs.openstack.org/releasenotes/puppet-cinder/mitaka.html
-send-announcements-to: openstack-announce@lists.openstack.org
 releases:
   - version: 7.1.0
     projects:
diff --git a/deliverables/_independent/puppet-designate.yaml b/deliverables/_independent/puppet-designate.yaml
index 1bf1415349..76d68a12df 100644
--- a/deliverables/_independent/puppet-designate.yaml
+++ b/deliverables/_independent/puppet-designate.yaml
@@ -3,10 +3,8 @@ launchpad: puppet-designate
 team: Puppet OpenStack
 type: other
 release-notes:
-  7.1.0: http://git.openstack.org/cgit/openstack/puppet-designate/tree/CHANGELOG.md?h=stable/liberty
   8.1.0: http://docs.openstack.org/releasenotes/puppet-designate/mitaka.html
   8.2.0: http://docs.openstack.org/releasenotes/puppet-designate/mitaka.html
-send-announcements-to: openstack-announce@lists.openstack.org
 releases:
   - version: 7.1.0
     projects:
diff --git a/deliverables/_independent/puppet-glance.yaml b/deliverables/_independent/puppet-glance.yaml
index d5691ec469..e03f460a87 100644
--- a/deliverables/_independent/puppet-glance.yaml
+++ b/deliverables/_independent/puppet-glance.yaml
@@ -3,10 +3,8 @@ launchpad: puppet-glance
 team: Puppet OpenStack
 type: other
 release-notes:
-  7.1.0: http://git.openstack.org/cgit/openstack/puppet-glance/tree/CHANGELOG.md?h=stable/liberty
   8.1.0: http://docs.openstack.org/releasenotes/puppet-glance/mitaka.html
   8.2.0: http://docs.openstack.org/releasenotes/puppet-glance/mitaka.html
-send-announcements-to: openstack-announce@lists.openstack.org
 releases:
   - version: 7.1.0
     projects:
diff --git a/deliverables/_independent/puppet-gnocchi.yaml b/deliverables/_independent/puppet-gnocchi.yaml
index ca06086328..cf8155fe35 100644
--- a/deliverables/_independent/puppet-gnocchi.yaml
+++ b/deliverables/_independent/puppet-gnocchi.yaml
@@ -3,10 +3,8 @@ launchpad: puppet-gnocchi
 team: Puppet OpenStack
 type: other
 release-notes:
-  7.1.0: http://git.openstack.org/cgit/openstack/puppet-gnocchi/tree/CHANGELOG.md?h=stable/liberty
   8.1.0: http://docs.openstack.org/releasenotes/puppet-gnocchi/mitaka.html
   8.2.0: http://docs.openstack.org/releasenotes/puppet-gnocchi/mitaka.html
-send-announcements-to: openstack-announce@lists.openstack.org
 releases:
   - version: 7.1.0
     projects:
diff --git a/deliverables/_independent/puppet-heat.yaml b/deliverables/_independent/puppet-heat.yaml
index 68bd5d3243..b7b87c946e 100644
--- a/deliverables/_independent/puppet-heat.yaml
+++ b/deliverables/_independent/puppet-heat.yaml
@@ -3,10 +3,8 @@ launchpad: puppet-heat
 team: Puppet OpenStack
 type: other
 release-notes:
-  7.1.0: http://git.openstack.org/cgit/openstack/puppet-heat/tree/CHANGELOG.md?h=stable/liberty
   8.1.0: http://docs.openstack.org/releasenotes/puppet-heat/mitaka.html
   8.2.0: http://docs.openstack.org/releasenotes/puppet-heat/mitaka.html
-send-announcements-to: openstack-announce@lists.openstack.org
 releases:
   - version: 7.1.0
     projects:
diff --git a/deliverables/_independent/puppet-horizon.yaml b/deliverables/_independent/puppet-horizon.yaml
index b954891391..5a80e0ade9 100644
--- a/deliverables/_independent/puppet-horizon.yaml
+++ b/deliverables/_independent/puppet-horizon.yaml
@@ -3,10 +3,8 @@ launchpad: puppet-horizon
 team: Puppet OpenStack
 type: other
 release-notes:
-  7.1.0: http://git.openstack.org/cgit/openstack/puppet-horizon/tree/CHANGELOG.md?h=stable/liberty
   8.1.0: http://docs.openstack.org/releasenotes/puppet-horizon/mitaka.html
   8.2.0: http://docs.openstack.org/releasenotes/puppet-horizon/mitaka.html
-send-announcements-to: openstack-announce@lists.openstack.org
 releases:
   - version: 7.1.0
     projects:
diff --git a/deliverables/_independent/puppet-ironic.yaml b/deliverables/_independent/puppet-ironic.yaml
index 56dcca0904..f066cea4c4 100644
--- a/deliverables/_independent/puppet-ironic.yaml
+++ b/deliverables/_independent/puppet-ironic.yaml
@@ -3,10 +3,8 @@ launchpad: puppet-ironic
 team: Puppet OpenStack
 type: other
 release-notes:
-  7.1.0: http://git.openstack.org/cgit/openstack/puppet-ironic/tree/CHANGELOG.md?h=stable/liberty
   8.1.0: http://docs.openstack.org/releasenotes/puppet-ironic/mitaka.html
   8.2.0: http://docs.openstack.org/releasenotes/puppet-ironic/mitaka.html
-send-announcements-to: openstack-announce@lists.openstack.org
 releases:
   - version: 7.1.0
     projects:
diff --git a/deliverables/_independent/puppet-keystone.yaml b/deliverables/_independent/puppet-keystone.yaml
index 5fdbae2234..c042b217c5 100644
--- a/deliverables/_independent/puppet-keystone.yaml
+++ b/deliverables/_independent/puppet-keystone.yaml
@@ -3,10 +3,8 @@ launchpad: puppet-keystone
 team: Puppet OpenStack
 type: other
 release-notes:
-  7.1.0: http://git.openstack.org/cgit/openstack/puppet-keystone/tree/CHANGELOG.md?h=stable/liberty
   8.1.0: http://docs.openstack.org/releasenotes/puppet-keystone/mitaka.html
   8.2.0: http://docs.openstack.org/releasenotes/puppet-keystone/mitaka.html
-send-announcements-to: openstack-announce@lists.openstack.org
 releases:
   - version: 7.1.0
     projects:
diff --git a/deliverables/_independent/puppet-manila.yaml b/deliverables/_independent/puppet-manila.yaml
index 24eb6be668..87ed63b606 100644
--- a/deliverables/_independent/puppet-manila.yaml
+++ b/deliverables/_independent/puppet-manila.yaml
@@ -3,10 +3,8 @@ launchpad: puppet-manila
 team: Puppet OpenStack
 type: other
 release-notes:
-  7.1.0: http://git.openstack.org/cgit/openstack/puppet-manila/tree/CHANGELOG.md?h=stable/liberty
   8.1.0: http://docs.openstack.org/releasenotes/puppet-manila/mitaka.html
   8.2.0: http://docs.openstack.org/releasenotes/puppet-manila/mitaka.html
-send-announcements-to: openstack-announce@lists.openstack.org
 releases:
   - version: 7.1.0
     projects:
diff --git a/deliverables/_independent/puppet-mistral.yaml b/deliverables/_independent/puppet-mistral.yaml
index c31f56d183..0c457008ca 100644
--- a/deliverables/_independent/puppet-mistral.yaml
+++ b/deliverables/_independent/puppet-mistral.yaml
@@ -3,7 +3,6 @@ launchpad: puppet-mistral
 team: Puppet OpenStack
 type: other
 release-notes: http://docs.openstack.org/releasenotes/puppet-mistral/mitaka.html
-send-announcements-to: openstack-announce@lists.openstack.org
 releases:
   - version: 8.1.0
     projects:
diff --git a/deliverables/_independent/puppet-murano.yaml b/deliverables/_independent/puppet-murano.yaml
index 8b8bb2e91f..8ad86c376c 100644
--- a/deliverables/_independent/puppet-murano.yaml
+++ b/deliverables/_independent/puppet-murano.yaml
@@ -3,10 +3,8 @@ launchpad: puppet-murano
 team: Puppet OpenStack
 type: other
 release-notes:
-  7.1.0: http://git.openstack.org/cgit/openstack/puppet-murano/tree/CHANGELOG.md?h=stable/liberty
   8.1.0: http://docs.openstack.org/releasenotes/puppet-murano/mitaka.html
   8.2.0: http://docs.openstack.org/releasenotes/puppet-murano/mitaka.html
-send-announcements-to: openstack-announce@lists.openstack.org
 releases:
   - version: 7.1.0
     projects:
diff --git a/deliverables/_independent/puppet-neutron.yaml b/deliverables/_independent/puppet-neutron.yaml
index 24d2e15732..9a0a94d21e 100644
--- a/deliverables/_independent/puppet-neutron.yaml
+++ b/deliverables/_independent/puppet-neutron.yaml
@@ -3,10 +3,8 @@ launchpad: puppet-neutron
 team: Puppet OpenStack
 type: other
 release-notes:
-  7.1.0: http://git.openstack.org/cgit/openstack/puppet-neutron/tree/CHANGELOG.md?h=stable/liberty
   8.1.0: http://docs.openstack.org/releasenotes/puppet-neutron/mitaka.html
   8.2.0: http://docs.openstack.org/releasenotes/puppet-neutron/mitaka.html
-send-announcements-to: openstack-announce@lists.openstack.org
 releases:
   - version: 7.1.0
     projects:
diff --git a/deliverables/_independent/puppet-nova.yaml b/deliverables/_independent/puppet-nova.yaml
index c7c3c4ba44..e3977ebf40 100644
--- a/deliverables/_independent/puppet-nova.yaml
+++ b/deliverables/_independent/puppet-nova.yaml
@@ -3,10 +3,8 @@ launchpad: puppet-nova
 team: Puppet OpenStack
 type: other
 release-notes:
-  7.1.0: http://git.openstack.org/cgit/openstack/puppet-nova/tree/CHANGELOG.md?h=stable/liberty
   8.1.0: http://docs.openstack.org/releasenotes/puppet-nova/mitaka.html
   8.2.0: http://docs.openstack.org/releasenotes/puppet-nova/mitaka.html
-send-announcements-to: openstack-announce@lists.openstack.org
 releases:
   - version: 7.1.0
     projects:
diff --git a/deliverables/_independent/puppet-openstack_extras.yaml b/deliverables/_independent/puppet-openstack_extras.yaml
index f2f0f876c1..b5c4ef072f 100644
--- a/deliverables/_independent/puppet-openstack_extras.yaml
+++ b/deliverables/_independent/puppet-openstack_extras.yaml
@@ -3,10 +3,8 @@ launchpad: puppet-openstack-extras
 team: Puppet OpenStack
 type: other
 release-notes:
-  7.1.0: http://git.openstack.org/cgit/openstack/puppet-openstack_extras/tree/CHANGELOG.md?h=stable/liberty
   8.1.0: http://docs.openstack.org/releasenotes/puppet-openstack_extras/mitaka.html
   8.2.0: http://docs.openstack.org/releasenotes/puppet-openstack_extras/mitaka.html
-send-announcements-to: openstack-announce@lists.openstack.org
 releases:
   - version: 7.1.0
     projects:
diff --git a/deliverables/_independent/puppet-openstacklib.yaml b/deliverables/_independent/puppet-openstacklib.yaml
index 04d73910e6..b11e0c47f1 100644
--- a/deliverables/_independent/puppet-openstacklib.yaml
+++ b/deliverables/_independent/puppet-openstacklib.yaml
@@ -3,10 +3,8 @@ launchpad: puppet-openstacklib
 team: Puppet OpenStack
 type: other
 release-notes:
-  7.1.0: http://git.openstack.org/cgit/openstack/puppet-openstacklib/tree/CHANGELOG.md?h=stable/liberty
   8.1.0: http://docs.openstack.org/releasenotes/puppet-openstacklib/mitaka.html
   8.2.0: http://docs.openstack.org/releasenotes/puppet-openstacklib/mitaka.html
-send-announcements-to: openstack-announce@lists.openstack.org
 releases:
   - version: 7.1.0
     projects:
diff --git a/deliverables/_independent/puppet-pacemaker.yaml b/deliverables/_independent/puppet-pacemaker.yaml
index 719cb45a6d..6a7b57c8e9 100644
--- a/deliverables/_independent/puppet-pacemaker.yaml
+++ b/deliverables/_independent/puppet-pacemaker.yaml
@@ -1,7 +1,6 @@
 ---
 launchpad: puppet-pacemaker
 team: Puppet OpenStack
-release-model: independent
 type: other
 branches:
   - name: stable/0.6.x
diff --git a/deliverables/_independent/puppet-sahara.yaml b/deliverables/_independent/puppet-sahara.yaml
index 3719022dd2..de1e193f9c 100644
--- a/deliverables/_independent/puppet-sahara.yaml
+++ b/deliverables/_independent/puppet-sahara.yaml
@@ -3,10 +3,8 @@ launchpad: puppet-sahara
 team: Puppet OpenStack
 type: other
 release-notes:
-  7.1.0: http://git.openstack.org/cgit/openstack/puppet-sahara/tree/CHANGELOG.md?h=stable/liberty
   8.1.0: http://docs.openstack.org/releasenotes/puppet-sahara/mitaka.html
   8.2.0: http://docs.openstack.org/releasenotes/puppet-sahara/mitaka.html
-send-announcements-to: openstack-announce@lists.openstack.org
 releases:
   - version: 7.1.0
     projects:
diff --git a/deliverables/_independent/puppet-swift.yaml b/deliverables/_independent/puppet-swift.yaml
index 304dc72f16..40aa6ed69e 100644
--- a/deliverables/_independent/puppet-swift.yaml
+++ b/deliverables/_independent/puppet-swift.yaml
@@ -3,10 +3,8 @@ launchpad: puppet-swift
 team: Puppet OpenStack
 type: other
 release-notes:
-  7.1.0: http://git.openstack.org/cgit/openstack/puppet-swift/tree/CHANGELOG.md?h=stable/liberty
   8.1.0: http://docs.openstack.org/releasenotes/puppet-swift/mitaka.html
   8.2.0: http://docs.openstack.org/releasenotes/puppet-swift/mitaka.html
-send-announcements-to: openstack-announce@lists.openstack.org
 releases:
   - version: 7.1.0
     projects:
diff --git a/deliverables/_independent/puppet-tempest.yaml b/deliverables/_independent/puppet-tempest.yaml
index 074528762a..c69f5ce350 100644
--- a/deliverables/_independent/puppet-tempest.yaml
+++ b/deliverables/_independent/puppet-tempest.yaml
@@ -3,10 +3,8 @@ launchpad: puppet-tempest
 team: Puppet OpenStack
 type: other
 release-notes:
-  7.1.0: http://git.openstack.org/cgit/openstack/puppet-tempest/tree/CHANGELOG.md?h=stable/liberty
   8.1.0: http://docs.openstack.org/releasenotes/puppet-tempest/mitaka.html
   8.2.0: http://docs.openstack.org/releasenotes/puppet-tempest/mitaka.html
-send-announcements-to: openstack-announce@lists.openstack.org
 releases:
   - version: 7.1.0
     projects:
diff --git a/deliverables/_independent/puppet-tripleo.yaml b/deliverables/_independent/puppet-tripleo.yaml
index 8d69feb5b0..31ebf82e0e 100644
--- a/deliverables/_independent/puppet-tripleo.yaml
+++ b/deliverables/_independent/puppet-tripleo.yaml
@@ -2,7 +2,6 @@
 launchpad: tripleo
 team: Puppet OpenStack
 type: other
-send-announcements-to: openstack-dev@lists.openstack.org
 releases:
   - version: 1.0.0
     projects:
diff --git a/deliverables/_independent/puppet-trove.yaml b/deliverables/_independent/puppet-trove.yaml
index 846182de27..d337166717 100644
--- a/deliverables/_independent/puppet-trove.yaml
+++ b/deliverables/_independent/puppet-trove.yaml
@@ -3,10 +3,8 @@ launchpad: puppet-trove
 team: Puppet OpenStack
 type: other
 release-notes:
-  7.1.0: http://git.openstack.org/cgit/openstack/puppet-trove/tree/CHANGELOG.md?h=stable/liberty
   8.1.0: http://docs.openstack.org/releasenotes/puppet-trove/mitaka.html
   8.2.0: http://docs.openstack.org/releasenotes/puppet-trove/mitaka.html
-send-announcements-to: openstack-announce@lists.openstack.org
 releases:
   - version: 7.1.0
     projects:
diff --git a/deliverables/_independent/puppet-vswitch.yaml b/deliverables/_independent/puppet-vswitch.yaml
index 515f31385d..33b84750db 100644
--- a/deliverables/_independent/puppet-vswitch.yaml
+++ b/deliverables/_independent/puppet-vswitch.yaml
@@ -3,10 +3,8 @@ launchpad: puppet-vswitch
 team: Puppet OpenStack
 type: other
 release-notes:
-  3.1.0: http://git.openstack.org/cgit/openstack/puppet-vswitch/tree/CHANGELOG.md?h=stable/liberty
   4.1.0: http://docs.openstack.org/releasenotes/puppet-vswitch/mitaka.html
   4.2.0: http://docs.openstack.org/releasenotes/puppet-vswitch/mitaka.html
-send-announcements-to: openstack-announce@lists.openstack.org
 releases:
   - version: 3.1.0
     projects:
diff --git a/deliverables/_independent/puppet-zaqar.yaml b/deliverables/_independent/puppet-zaqar.yaml
index a222bffad0..d4932b2625 100644
--- a/deliverables/_independent/puppet-zaqar.yaml
+++ b/deliverables/_independent/puppet-zaqar.yaml
@@ -3,7 +3,6 @@ launchpad: puppet-zaqar
 team: Puppet OpenStack
 type: other
 release-notes: http://docs.openstack.org/releasenotes/puppet-zaqar/mitaka.html
-send-announcements-to: openstack-announce@lists.openstack.org
 releases:
   - version: 8.1.0
     projects:
diff --git a/deliverables/_independent/pylockfile.yaml b/deliverables/_independent/pylockfile.yaml
index 8115ff1063..12715617a9 100644
--- a/deliverables/_independent/pylockfile.yaml
+++ b/deliverables/_independent/pylockfile.yaml
@@ -2,14 +2,15 @@
 launchpad: pylockfile
 team: oslo
 type: library
-send-announcements-to: openstack-dev@lists.openstack.org
 include-pypi-link: yes
 releases:
   - version: 0.11.0
     projects:
       - repo: openstack/pylockfile
         hash: 4a7a20d91c44d2be6396be5fc64d27b0b5afa4e2
+        tarball-base: lockfile
   - version: 0.12.2
     projects:
       - repo: openstack/pylockfile
         hash: c8798cedfbc4d738c99977a07cde2de54687ac6c
+        tarball-base: lockfile
diff --git a/deliverables/_independent/pymod2pkg.yaml b/deliverables/_independent/pymod2pkg.yaml
index 9fc55d8c6f..7f2032534e 100644
--- a/deliverables/_independent/pymod2pkg.yaml
+++ b/deliverables/_independent/pymod2pkg.yaml
@@ -2,7 +2,6 @@
 launchpad: pymod2pkg
 team: Packaging-rpm
 type: other
-send-announcements-to: openstack-announce@lists.openstack.org
 releases:
   - version: 0.4.0
     projects:
diff --git a/deliverables/_independent/python-cueclient.yaml b/deliverables/_independent/python-cueclient.yaml
index b702091b12..b6957d04b7 100644
--- a/deliverables/_independent/python-cueclient.yaml
+++ b/deliverables/_independent/python-cueclient.yaml
@@ -1,7 +1,7 @@
 ---
 launchpad: python-cueclient
 team: cue
-send-announcements-to: openstack-announce@lists.openstack.org
+type: library
 releases:
   - version: 0.9.0
     projects:
diff --git a/deliverables/_independent/python-gnocchiclient.yaml b/deliverables/_independent/python-gnocchiclient.yaml
index a0852109db..7cc85cf965 100644
--- a/deliverables/_independent/python-gnocchiclient.yaml
+++ b/deliverables/_independent/python-gnocchiclient.yaml
@@ -2,7 +2,10 @@
 launchpad: python-gnocchiclient
 team: Telemetry
 type: library
-send-announcements-to: openstack-announce@lists.openstack.org
+repository-settings:
+  openstack/python-gnocchiclient:
+    flags:
+      - retired
 releases:
   - version: 1.0.0
     projects:
diff --git a/deliverables/_independent/python-karborclient.yaml b/deliverables/_independent/python-karborclient.yaml
index 6a85274bf5..25dbcc1211 100644
--- a/deliverables/_independent/python-karborclient.yaml
+++ b/deliverables/_independent/python-karborclient.yaml
@@ -1,10 +1,8 @@
 ---
 include-pypi-link: true
 launchpad: python-karborclient
-release-model: independent
 team: karbor
 type: library
-send-announcements-to: openstack-announce@lists.openstack.org
 branches:
   - name: stable/ocata
     location: 0.1.3
diff --git a/deliverables/_independent/python-keystoneclient-kerberos.yaml b/deliverables/_independent/python-keystoneclient-kerberos.yaml
index 7cbbbaf48f..ce59c1db3f 100644
--- a/deliverables/_independent/python-keystoneclient-kerberos.yaml
+++ b/deliverables/_independent/python-keystoneclient-kerberos.yaml
@@ -2,12 +2,15 @@
 launchpad: python-keystoneclient-kerberos
 team: keystone
 type: library
-send-announcements-to: openstack-announce@lists.openstack.org
 include-pypi-link: true
+repository-settings:
+  openstack/python-keystoneclient-kerberos:
+    flags:
+      - retired
 releases:
-- version: 0.3.0
-  projects:
-  - repo: openstack/python-keystoneclient-kerberos
-    hash: c11563678f29726dce18aec5e54a55947941f99a
-  highlights: |
-    - Final release; this project has been deprecated in favor of keystoneauth
+  - version: 0.3.0
+    projects:
+      - repo: openstack/python-keystoneclient-kerberos
+        hash: c11563678f29726dce18aec5e54a55947941f99a
+    highlights: |
+      - Final release; this project has been deprecated in favor of keystoneauth
diff --git a/deliverables/_independent/python-magnumclient.yaml b/deliverables/_independent/python-magnumclient.yaml
index 8b5c2d0495..1ad98b4298 100644
--- a/deliverables/_independent/python-magnumclient.yaml
+++ b/deliverables/_independent/python-magnumclient.yaml
@@ -2,7 +2,6 @@
 launchpad: python-magnumclient
 team: magnum
 type: library
-send-announcements-to: openstack-announce@lists.openstack.org
 releases:
   - version: 1.1.0
     projects:
diff --git a/deliverables/_independent/python-solumclient.yaml b/deliverables/_independent/python-solumclient.yaml
index 141541e13c..01e31364e9 100644
--- a/deliverables/_independent/python-solumclient.yaml
+++ b/deliverables/_independent/python-solumclient.yaml
@@ -2,7 +2,6 @@
 launchpad: python-solumclient
 team: solum
 type: other
-send-announcements-to: openstack-announce@lists.openstack.org
 releases:
   - version: 1.2.7
     projects:
diff --git a/deliverables/_independent/python-tuskarclient.yaml b/deliverables/_independent/python-tuskarclient.yaml
index 043ffe37e9..d32fe2b3c8 100644
--- a/deliverables/_independent/python-tuskarclient.yaml
+++ b/deliverables/_independent/python-tuskarclient.yaml
@@ -1,7 +1,7 @@
 ---
 launchpad: python-tuskarclient
 team: tripleo
-send-announcements-to: openstack-announce@lists.openstack.org
+type: library
 repository-settings:
   openstack/python-tuskarclient:
     flags:
diff --git a/deliverables/_independent/python-wsmanclient.yaml b/deliverables/_independent/python-wsmanclient.yaml
index a6642d492e..65ce81c940 100644
--- a/deliverables/_independent/python-wsmanclient.yaml
+++ b/deliverables/_independent/python-wsmanclient.yaml
@@ -2,8 +2,11 @@
 launchpad: python-wsmanclient
 team: ironic
 type: library
-send-announcements-to: openstack-announce@lists.openstack.org
 include-pypi-link: yes
+repository-settings:
+  openstack/python-wsmanclient:
+    flags:
+      - retired
 releases:
   - version: 0.0.1
     projects:
diff --git a/deliverables/_independent/python-zunclient.yaml b/deliverables/_independent/python-zunclient.yaml
index 0b1ea35215..60581f53a6 100644
--- a/deliverables/_independent/python-zunclient.yaml
+++ b/deliverables/_independent/python-zunclient.yaml
@@ -2,7 +2,6 @@
 launchpad: python-zunclient
 team: zun
 type: library
-send-announcements-to: openstack-announce@lists.openstack.org
 releases:
   - version: 0.1.0
     projects:
diff --git a/deliverables/_independent/rally.yaml b/deliverables/_independent/rally.yaml
index e035f5df26..8af93077c6 100644
--- a/deliverables/_independent/rally.yaml
+++ b/deliverables/_independent/rally.yaml
@@ -4,7 +4,6 @@ team: rally
 type: other
 release-notes: http://rally.readthedocs.io/en/latest/project_info/release_notes/archive.html
 include-pypi-link: yes
-send-announcements-to: openstack-announce@lists.openstack.org
 branches:
   - name: stable/0.9
     location: 0.9.0
diff --git a/deliverables/_independent/refstack.yaml b/deliverables/_independent/refstack.yaml
index 30116de15f..cb4a826e69 100644
--- a/deliverables/_independent/refstack.yaml
+++ b/deliverables/_independent/refstack.yaml
@@ -2,7 +2,6 @@
 launchpad: refstack
 team: RefStack
 type: service
-send-announcements-to: defcore-committee@lists.openstack.org
 
 releases:
   - version: 1.0.0
diff --git a/deliverables/_independent/renderspec.yaml b/deliverables/_independent/renderspec.yaml
index 53fd41b2cc..6aad5a94cd 100644
--- a/deliverables/_independent/renderspec.yaml
+++ b/deliverables/_independent/renderspec.yaml
@@ -2,7 +2,6 @@
 launchpad: renderspec
 team: Packaging-rpm
 type: other
-send-announcements-to: openstack-announce@lists.openstack.org
 releases:
   - version: 1.0.0
     projects:
diff --git a/deliverables/_independent/reno.yaml b/deliverables/_independent/reno.yaml
index 0c6f622512..0dc0e72126 100644
--- a/deliverables/_independent/reno.yaml
+++ b/deliverables/_independent/reno.yaml
@@ -2,7 +2,6 @@
 launchpad: reno
 team: Release Management
 type: other
-send-announcements-to: openstack-dev@lists.openstack.org
 include-pypi-link: yes
 branches:
   - name: stable/newton
diff --git a/deliverables/_independent/sahara-tests.yaml b/deliverables/_independent/sahara-tests.yaml
index ee30c28c15..531a7b17af 100644
--- a/deliverables/_independent/sahara-tests.yaml
+++ b/deliverables/_independent/sahara-tests.yaml
@@ -2,7 +2,6 @@
 launchpad: sahara-tests
 team: sahara
 type: other
-send-announcements-to: openstack-dev@lists.openstack.org
 release-notes: https://docs.openstack.org/releasenotes/sahara-tests/index.html
 releases:
   - version: 0.1.0
diff --git a/deliverables/_independent/solum.yaml b/deliverables/_independent/solum.yaml
index 6c6c9d43c0..b91cb0a324 100644
--- a/deliverables/_independent/solum.yaml
+++ b/deliverables/_independent/solum.yaml
@@ -2,7 +2,6 @@
 launchpad: solum
 team: solum
 type: service
-send-announcements-to: openstack-announce@lists.openstack.org
 releases:
   - version: 4.0.0
     projects:
diff --git a/deliverables/_independent/storlets.yaml b/deliverables/_independent/storlets.yaml
index 9420c1a338..1d25351d63 100644
--- a/deliverables/_independent/storlets.yaml
+++ b/deliverables/_independent/storlets.yaml
@@ -2,7 +2,6 @@
 launchpad: storlets
 team: storlets
 type: service
-send-announcements-to: openstack-announce@lists.openstack.org
 branches:
   - name: stable/ocata
     location: 0.4.0
diff --git a/deliverables/_independent/sushy-tools.yaml b/deliverables/_independent/sushy-tools.yaml
index fa56359ea0..f9ccfbe23e 100644
--- a/deliverables/_independent/sushy-tools.yaml
+++ b/deliverables/_independent/sushy-tools.yaml
@@ -1,9 +1,7 @@
 ---
 launchpad: sushy
 team: ironic
-release-model: independent
 type: other
-send-announcements-to: openstack-dev@lists.openstack.org
 releases:
   - version: 0.1.0
     projects:
diff --git a/deliverables/_independent/syntribos.yaml b/deliverables/_independent/syntribos.yaml
index 64b6822ddf..bb04ebefbe 100644
--- a/deliverables/_independent/syntribos.yaml
+++ b/deliverables/_independent/syntribos.yaml
@@ -1,7 +1,6 @@
 ---
 launchpad: syntribos
 team: Security
-send-announcements-to: openstack-dev@lists.openstack.org
 include-pypi-link: yes
 type: other
 releases:
diff --git a/deliverables/_independent/tosca-parser.yaml b/deliverables/_independent/tosca-parser.yaml
index b8711aee44..a5b7fc84e1 100644
--- a/deliverables/_independent/tosca-parser.yaml
+++ b/deliverables/_independent/tosca-parser.yaml
@@ -1,10 +1,8 @@
 ---
 include-pypi-link: yes
 launchpad: tosca-parser
-release-model: independent
 team: heat
 type: library
-send-announcements-to: openstack-announce@lists.openstack.org
 releases:
   - version: 0.1.0
     projects:
diff --git a/deliverables/_independent/tripleo-image-elements.yaml b/deliverables/_independent/tripleo-image-elements.yaml
index e3c3e3bff7..155b23740c 100644
--- a/deliverables/_independent/tripleo-image-elements.yaml
+++ b/deliverables/_independent/tripleo-image-elements.yaml
@@ -2,7 +2,6 @@
 launchpad: tripleo
 team: tripleo
 type: other
-send-announcements-to: openstack-dev@lists.openstack.org
 releases:
   - version: 0.9.5
     projects:
diff --git a/deliverables/_independent/tripleo-puppet-elements.yaml b/deliverables/_independent/tripleo-puppet-elements.yaml
index 7092f55cc0..5b366cefbc 100644
--- a/deliverables/_independent/tripleo-puppet-elements.yaml
+++ b/deliverables/_independent/tripleo-puppet-elements.yaml
@@ -2,7 +2,6 @@
 launchpad: tripleo
 team: tripleo
 type: other
-send-announcements-to: openstack-dev@lists.openstack.org
 releases:
   - version: 0.0.1
     projects:
diff --git a/deliverables/_independent/tuskar-ui.yaml b/deliverables/_independent/tuskar-ui.yaml
index fe93333285..ddf7e75eea 100644
--- a/deliverables/_independent/tuskar-ui.yaml
+++ b/deliverables/_independent/tuskar-ui.yaml
@@ -1,7 +1,7 @@
 ---
 launchpad: tuskar-ui
 team: tripleo
-send-announcements-to: openstack-announce@lists.openstack.org
+type: horizon-plugin
 repository-settings:
   openstack/tuskar-ui:
     flags:
diff --git a/deliverables/_independent/tuskar.yaml b/deliverables/_independent/tuskar.yaml
index 632ab548e7..375e921914 100644
--- a/deliverables/_independent/tuskar.yaml
+++ b/deliverables/_independent/tuskar.yaml
@@ -1,7 +1,7 @@
 ---
 launchpad: tuskar
 team: tripleo
-send-announcements-to: openstack-announce@lists.openstack.org
+type: other
 repository-settings:
   openstack/tuskar:
     flags:
diff --git a/deliverables/_independent/virtualbmc.yaml b/deliverables/_independent/virtualbmc.yaml
index 59f02952cc..e5f6ffc50b 100644
--- a/deliverables/_independent/virtualbmc.yaml
+++ b/deliverables/_independent/virtualbmc.yaml
@@ -2,7 +2,6 @@
 launchpad: virtualbmc
 team: ironic
 type: other
-send-announcements-to: openstack-dev@lists.openstack.org
 releases:
   - version: 0.1.0
     projects:
diff --git a/deliverables/_independent/xstatic-angular-bootstrap.yaml b/deliverables/_independent/xstatic-angular-bootstrap.yaml
index 47f0d79cb2..aa1f0a83dc 100644
--- a/deliverables/_independent/xstatic-angular-bootstrap.yaml
+++ b/deliverables/_independent/xstatic-angular-bootstrap.yaml
@@ -4,17 +4,19 @@ team: horizon
 type: other
 release-type: xstatic
 include-pypi-link: yes
-send-announcements-to: openstack-dev@lists.openstack.org
 releases:
   - version: 0.11.0.3
     projects:
       - repo: openstack/xstatic-angular-bootstrap
         hash: b581edb6975175a564fd02766aef2f9043702c80
+        tarball-base: XStatic-Angular-Bootstrap
   - version: 0.11.0.8
     projects:
       - repo: openstack/xstatic-angular-bootstrap
         hash: 7a2e73684634a979b43bd157301dd59bde967ec9
+        tarball-base: XStatic-Angular-Bootstrap
   - version: 2.2.0.0
     projects:
       - repo: openstack/xstatic-angular-bootstrap
         hash: 9d7f18344d4862f23a2b919d83914a6f4a3eec9e
+        tarball-base: XStatic-Angular-Bootstrap
diff --git a/deliverables/_independent/xstatic-angular-gettext.yaml b/deliverables/_independent/xstatic-angular-gettext.yaml
index 3b1ed58ddf..79f4b6aa0f 100644
--- a/deliverables/_independent/xstatic-angular-gettext.yaml
+++ b/deliverables/_independent/xstatic-angular-gettext.yaml
@@ -4,9 +4,9 @@ team: horizon
 type: other
 release-type: xstatic
 include-pypi-link: yes
-send-announcements-to: openstack-dev@lists.openstack.org
 releases:
   - version: 2.3.8.0
     projects:
       - repo: openstack/xstatic-angular-gettext
         hash: 6ec7c032b3a87159f14d6d2138e03d73fc8b57b0
+        tarball-base: XStatic-Angular-Gettext
diff --git a/deliverables/_independent/xstatic-angular-smart-table.yaml b/deliverables/_independent/xstatic-angular-smart-table.yaml
index b7e19e6935..68e48c7dfe 100644
--- a/deliverables/_independent/xstatic-angular-smart-table.yaml
+++ b/deliverables/_independent/xstatic-angular-smart-table.yaml
@@ -4,17 +4,19 @@ team: horizon
 type: other
 release-type: xstatic
 include-pypi-link: yes
-send-announcements-to: openstack-dev@lists.openstack.org
 releases:
   - version: 1.4.13.0
     projects:
       - repo: openstack/xstatic-angular-smart-table
         hash: a5ace69bc0ed04b76addd5bbb6edd73f6be47662
+        tarball-base: XStatic-smart-table
   - version: 1.4.13.1
     projects:
       - repo: openstack/xstatic-angular-smart-table
         hash: 9a6a7764317d3a9db530f599d5958d3e14126551
+        tarball-base: XStatic-smart-table
   - version: 1.4.13.2
     projects:
       - repo: openstack/xstatic-angular-smart-table
         hash: 3989e1f8e350c365c7bf1074ca9026b3a851b47f
+        tarball-base: XStatic-smart-table
diff --git a/deliverables/_independent/xstatic-angular.yaml b/deliverables/_independent/xstatic-angular.yaml
index 1b959caeeb..359e99191d 100644
--- a/deliverables/_independent/xstatic-angular.yaml
+++ b/deliverables/_independent/xstatic-angular.yaml
@@ -4,13 +4,14 @@ team: horizon
 type: other
 release-type: xstatic
 include-pypi-link: yes
-send-announcements-to: openstack-dev@lists.openstack.org
 releases:
   - version: 1.4.10.1
     projects:
       - repo: openstack/xstatic-angular
         hash: 5a30bee80d67c0f26ecbf05726f4838dbae3f276
+        tarball-base: XStatic-Angular
   - version: 1.5.8.0
     projects:
       - repo: openstack/xstatic-angular
         hash: 8d809659b75b616461877807c937cb5fa2173b31
+        tarball-base: XStatic-Angular
diff --git a/deliverables/_independent/xstatic-bootstrap-scss.yaml b/deliverables/_independent/xstatic-bootstrap-scss.yaml
index 895c34e0a0..5f387f2ca0 100644
--- a/deliverables/_independent/xstatic-bootstrap-scss.yaml
+++ b/deliverables/_independent/xstatic-bootstrap-scss.yaml
@@ -4,13 +4,14 @@ team: horizon
 type: other
 release-type: xstatic
 include-pypi-link: yes
-send-announcements-to: openstack-dev@lists.openstack.org
 releases:
   - version: 3.3.7.0
     projects:
       - repo: openstack/xstatic-bootstrap-scss
         hash: 577f0ce201e48aaf2d5fbf4d9799013eb108ffd3
+        tarball-base: XStatic-Bootstrap-SCSS
   - version: 3.3.7.1
     projects:
       - repo: openstack/xstatic-bootstrap-scss
         hash: 4ca4a059f89287b40441566a4a6bf32785295504
+        tarball-base: XStatic-Bootstrap-SCSS
diff --git a/deliverables/_independent/xstatic-bootswatch.yaml b/deliverables/_independent/xstatic-bootswatch.yaml
index 644ba18c2f..56ad14c432 100644
--- a/deliverables/_independent/xstatic-bootswatch.yaml
+++ b/deliverables/_independent/xstatic-bootswatch.yaml
@@ -4,9 +4,9 @@ team: horizon
 type: other
 release-type: xstatic
 include-pypi-link: yes
-send-announcements-to: openstack-dev@lists.openstack.org
 releases:
   - version: 3.3.7.0
     projects:
       - repo: openstack/xstatic-bootswatch
         hash: 49c0d56698bc14ae5e5c18cc00c3f2e290d2e724
+        tarball-base: XStatic-bootswatch
diff --git a/deliverables/_independent/xstatic-d3.yaml b/deliverables/_independent/xstatic-d3.yaml
index 54f897f683..5109be4c38 100644
--- a/deliverables/_independent/xstatic-d3.yaml
+++ b/deliverables/_independent/xstatic-d3.yaml
@@ -4,9 +4,9 @@ team: horizon
 type: other
 release-type: xstatic
 include-pypi-link: yes
-send-announcements-to: openstack-dev@lists.openstack.org
 releases:
   - version: 3.5.17.0
     projects:
       - repo: openstack/xstatic-d3
         hash: d2c33c15a81574c5380c1825aaa4b2a2c584bd4f
+        tarball-base: XStatic-D3
diff --git a/deliverables/_independent/xstatic-font-awesome.yaml b/deliverables/_independent/xstatic-font-awesome.yaml
index 066ee00996..83abfe18f9 100644
--- a/deliverables/_independent/xstatic-font-awesome.yaml
+++ b/deliverables/_independent/xstatic-font-awesome.yaml
@@ -4,9 +4,9 @@ team: horizon
 type: other
 release-type: xstatic
 include-pypi-link: yes
-send-announcements-to: openstack-dev@lists.openstack.org
 releases:
   - version: 4.7.0.0
     projects:
       - repo: openstack/xstatic-font-awesome
         hash: 8a671c3f6f5cf0248c8c0cb6080db7f11c80bd41
+        tarball-base: XStatic-Font-Awesome
diff --git a/deliverables/_independent/xstatic-jsencrypt.yaml b/deliverables/_independent/xstatic-jsencrypt.yaml
index 304c511fc0..c028ef3ef5 100644
--- a/deliverables/_independent/xstatic-jsencrypt.yaml
+++ b/deliverables/_independent/xstatic-jsencrypt.yaml
@@ -4,13 +4,14 @@ team: horizon
 type: other
 release-type: xstatic
 include-pypi-link: yes
-send-announcements-to: openstack-dev@lists.openstack.org
 releases:
   - version: 2.3.1.0
     projects:
       - repo: openstack/xstatic-jsencrypt
         hash: 5526c15f91b471fdc5efc48ddcdb85c585e57077
+        tarball-base: XStatic-JSEncrypt
   - version: 2.3.1.1
     projects:
       - repo: openstack/xstatic-jsencrypt
         hash: 27ddd977cb634604d8455a242a1b43ad72a3b0f9
+        tarball-base: XStatic-JSEncrypt
diff --git a/deliverables/_independent/xstatic-roboto-fontface.yaml b/deliverables/_independent/xstatic-roboto-fontface.yaml
index 473decabec..a574d48630 100644
--- a/deliverables/_independent/xstatic-roboto-fontface.yaml
+++ b/deliverables/_independent/xstatic-roboto-fontface.yaml
@@ -4,9 +4,9 @@ team: horizon
 type: other
 release-type: xstatic
 include-pypi-link: yes
-send-announcements-to: openstack-dev@lists.openstack.org
 releases:
   - version: 0.5.0.0
     projects:
       - repo: openstack/xstatic-roboto-fontface
         hash: 480b520263b01ef06bafa6026c42c410112dd1a3
+        tarball-base: XStatic-roboto-fontface
diff --git a/deliverables/_independent/yaml2ical.yaml b/deliverables/_independent/yaml2ical.yaml
index 18c9058322..39df29da82 100644
--- a/deliverables/_independent/yaml2ical.yaml
+++ b/deliverables/_independent/yaml2ical.yaml
@@ -2,7 +2,6 @@
 launchpad: yaml2ical
 team: Infrastructure
 type: other
-send-announcements-to: openstack-dev@lists.openstack.org
 releases:
   - version: 0.1.0
     projects:
diff --git a/deliverables/_independent/yaql.yaml b/deliverables/_independent/yaql.yaml
index c25332ac99..635ec7f812 100644
--- a/deliverables/_independent/yaql.yaml
+++ b/deliverables/_independent/yaql.yaml
@@ -1,12 +1,10 @@
 ---
 include-pypi-link: yes
 launchpad: yaql
-release-model: independent
 team: murano
 type: library
-send-announcements-to: openstack-announce@lists.openstack.org
 releases:
-  - version: 0.2
+  - version: "0.2"
     projects:
       - repo: openstack/yaql
         hash: f6f81e3ed9fdf368ac9d4c2727bcd52ccd5e3684