diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml
index 76cf2d511b..dc1258e5aa 100644
--- a/gerritbot/channels.yaml
+++ b/gerritbot/channels.yaml
@@ -1,3 +1,358 @@
+billingstack:
+    events:
+      - patchset-created
+      - change-merged
+      - x-vrif-minus-2
+    projects:
+      - stackforge/billingstack
+    branches:
+      - master
+
+congress:
+    events:
+      - patchset-created
+      - change-merged
+      - x-vrif-minus-2
+    projects:
+      - stackforge/congress
+      - stackforge/python-congressclient
+      - stackforge/congress-specs
+      - stackforge/python-cloudfoundryclient
+    branches:
+      - master
+
+dox:
+    events:
+      - patchset-created
+      - change-merged
+      - x-vrif-minus-2
+    projects:
+      - stackforge/dox
+    branches:
+      - master
+
+fuel-tracker:
+    events:
+      - patchset-created
+      - change-merged
+      - x-vrif-minus-2
+    projects:
+      - stackforge/fuel-web
+      - stackforge/fuel-astute
+      - stackforge/fuel-ostf
+      - stackforge/fuel-main
+      - stackforge/fuel-provision
+      - stackforge/fuel-docs
+      - stackforge/fuel-library
+      - stackforge/fuel-devops
+      - stackforge/fuel-specs
+      - stackforge/fuel-stats
+      - stackforge/fuel-plugins
+      - stackforge/fuel-plugin-cinder-netapp
+      - stackforge/fuel-plugin-contrail
+      - stackforge/fuel-plugin-elasticsearch-kibana
+      - stackforge/fuel-plugin-external-emc
+      - stackforge/fuel-plugin-external-glusterfs
+      - stackforge/fuel-plugin-external-nfs
+      - stackforge/fuel-plugin-external-zabbix
+      - stackforge/fuel-plugin-ha-fencing
+      - stackforge/fuel-plugin-influxdb-grafana
+      - stackforge/fuel-plugin-lma-collector
+      - stackforge/fuel-plugin-mellanox
+      - stackforge/fuel-plugin-neutron-fwaas
+      - stackforge/fuel-plugin-neutron-lbaas
+      - stackforge/fuel-plugin-neutron-vpnaas
+      - stackforge/fuel-qa
+      - stackforge/fuel-tasks-validator
+      - stackforge/python-fuelclient
+    branches:
+      - master
+
+git-upstream:
+    events:
+      - patchset-created
+      - change-merged
+      - x-vrif-minus-2
+    projects:
+      - stackforge/git-upstream
+    branches:
+      - master
+
+heat:
+    events:
+      - patchset-created
+      - change-merged
+      - x-vrif-minus-2
+    projects:
+      - openstack/heat
+      - openstack/python-heatclient
+      - openstack/heat-cfntools
+      - openstack/heat-templates
+      - openstack/heat-specs
+      - openstack-dev/heat-cfnclient
+    branches:
+      - master
+
+magnetodb:
+    events:
+      - patchset-created
+      - change-merged
+      - x-vrif-minus-2
+    projects:
+      - stackforge/python-magnetodbclient
+      - stackforge/magnetodb
+      - stackforge/magnetodb-specs
+    branches:
+      - master
+
+milk-dev:
+    events:
+      - patchset-created
+      - change-merged
+      - x-vrif-minus-2
+    projects:
+      - stackforge/milk
+    branches:
+      - master
+
+murano:
+    events:
+      - patchset-created
+      - change-merged
+      - x-vrif-minus-2
+    projects:
+      - stackforge/murano
+      - stackforge/murano-agent
+      - stackforge/murano-apps
+      - stackforge/murano-dashboard
+      - stackforge/murano-deployment
+      - stackforge/murano-docs
+      - stackforge/murano-specs
+      - stackforge/python-muranoclient
+    branches:
+      - master
+
+nova-docker:
+    events:
+      - patchset-created
+      - change-merged
+      - x-vrif-minus-2
+    projects:
+      - stackforge/nova-docker
+    branches:
+      - master
+
+openstack-ansible:
+    events:
+      - patchset-created
+      - change-merged
+      - x-vrif-minus-2
+    projects:
+      - stackforge/os-ansible-deployment
+    branches:
+      - master
+      - icehouse
+      - juno
+      - kilo
+
+openstack-anvil:
+    events:
+      - patchset-created
+      - change-merged
+      - x-vrif-minus-2
+    projects:
+      - stackforge/anvil
+    branches:
+      - master
+
+openstack-barbican:
+    events:
+      - patchset-created
+      - change-merged
+      - x-vrif-minus-2
+    projects:
+      - openstack/barbican
+      - openstack/barbican-specs
+      - openstack/castellan
+      - openstack/kite
+      - openstack/python-barbicanclient
+      - openstack/python-kiteclient
+    branches:
+      - master
+
+openstack-blazar:
+    events:
+      - patchset-created
+      - change-merged
+      - x-vrif-minus-2
+    projects:
+      - stackforge/blazar
+      - stackforge/blazar-nova
+      - stackforge/python-blazarclient
+    branches:
+      - master
+
+openstack-ceilometer:
+    events:
+      - patchset-created
+      - change-merged
+      - x-vrif-minus-2
+    projects:
+      - openstack/ceilometer
+      - openstack/ceilometer-specs
+      - openstack/python-ceilometerclient
+      - openstack/ceilometermiddleware
+      - stackforge/gnocchi
+    branches:
+      - master
+
+openstack-chef:
+    events:
+      - patchset-created
+      - change-merged
+      - x-vrif-minus-2
+    projects:
+      - stackforge/cookbook-openstack-bare-metal
+      - stackforge/cookbook-openstack-block-storage
+      - stackforge/cookbook-openstack-client
+      - stackforge/cookbook-openstack-common
+      - stackforge/cookbook-openstack-compute
+      - stackforge/cookbook-openstack-dashboard
+      - stackforge/cookbook-openstack-data-processing
+      - stackforge/cookbook-openstack-database
+      - stackforge/cookbook-openstack-identity
+      - stackforge/cookbook-openstack-image
+      - stackforge/cookbook-openstack-integration-test
+      - stackforge/cookbook-openstack-network
+      - stackforge/cookbook-openstack-object-storage
+      - stackforge/cookbook-openstack-ops-database
+      - stackforge/cookbook-openstack-ops-messaging
+      - stackforge/cookbook-openstack-orchestration
+      - stackforge/cookbook-openstack-telemetry
+      - stackforge/cookbook-pacemaker
+      - stackforge/openstack-chef-repo
+      - stackforge/openstack-chef-specs
+    branches:
+      - master
+      - stable/icehouse
+      - stable/juno
+
+openstack-cinder:
+    events:
+      - patchset-created
+      - x-vrif-minus-2
+    projects:
+      - openstack/cinder
+      - openstack/cinder-specs
+      - openstack/python-cinderclient
+      - openstack/os-brick
+    branches:
+      - master
+
+openstack-containers:
+    events:
+      - patchset-created
+      - change-merged
+      - x-vrif-minus-2
+    projects:
+      - stackforge/magnum
+      - stackforge/python-magnumclient
+    branches:
+      - master
+
+openstack-dns:
+    events:
+      - patchset-created
+      - change-merged
+      - x-vrif-minus-2
+    projects:
+      - openstack/designate
+      - openstack/designate-specs
+      - openstack/python-designateclient
+      - stackforge/designate-msdnsagent
+    branches:
+      - master
+
+openstack-doc:
+    events:
+      - patchset-created
+      - change-merged
+      - x-vrif-minus-2
+    projects:
+      - openstack/api-site
+      - openstack/docs-specs
+      - openstack/ha-guide
+      - openstack/openstackdocstheme
+      - openstack/openstack-doc-tools
+      - openstack/openstack-manuals
+      - openstack/operations-guide
+      - openstack/security-doc
+      - openstack/training-guides
+      - stackforge/clouddocs-maven-plugin
+    branches:
+      - master
+      - stable/icehouse
+      - stable/juno
+
+openstack-entropy:
+    events:
+      - patchset-created
+      - change-merged
+      - x-vrif-minus-2
+    projects:
+      - stackforge/entropy
+    branches:
+      - master
+
+openstack-gbp:
+    events:
+      - patchset-created
+      - change-merged
+      - x-vrif-minus-2
+    projects:
+      - stackforge/group-based-policy
+      - stackforge/group-based-policy-specs
+      - stackforge/group-based-policy-ui
+      - stackforge/group-based-policy-automation
+      - stackforge/python-group-based-policy-client
+    branches:
+      - master
+
+openstack-glance:
+    events:
+      - patchset-created
+      - change-merged
+      - x-vrif-minus-2
+    projects:
+      - openstack/glance
+      - openstack/glance-specs
+      - openstack/glance_store
+      - openstack/python-glanceclient
+    branches:
+      - master
+
+openstack-horizon:
+    events:
+      - patchset-created
+      - change-merged
+      - x-vrif-minus-2
+    projects:
+      - openstack/horizon
+      - openstack/django_openstack_auth
+      - openstack/tuskar-ui
+    branches:
+      - master
+
+openstack-hyper-v:
+    events:
+      - patchset-created
+      - change-merged
+      - x-vrif-minus-2
+    projects:
+      - stackforge/networking-hyperv
+    branches:
+      - master
+
 openstack-infra:
     events:
       - patchset-created
@@ -132,356 +487,6 @@ openstack-infra:
       - using-your-own
       - zuul
 
-openstack-doc:
-    events:
-      - patchset-created
-      - change-merged
-      - x-vrif-minus-2
-    projects:
-      - openstack/api-site
-      - openstack/docs-specs
-      - openstack/ha-guide
-      - openstack/openstackdocstheme
-      - openstack/openstack-doc-tools
-      - openstack/openstack-manuals
-      - openstack/operations-guide
-      - openstack/security-doc
-      - openstack/training-guides
-      - stackforge/clouddocs-maven-plugin
-    branches:
-      - master
-      - stable/icehouse
-      - stable/juno
-
-openstack-containers:
-    events:
-      - patchset-created
-      - change-merged
-      - x-vrif-minus-2
-    projects:
-      - stackforge/magnum
-      - stackforge/python-magnumclient
-    branches:
-      - master
-
-openstack-ceilometer:
-    events:
-      - patchset-created
-      - change-merged
-      - x-vrif-minus-2
-    projects:
-      - openstack/ceilometer
-      - openstack/ceilometer-specs
-      - openstack/python-ceilometerclient
-      - openstack/ceilometermiddleware
-      - stackforge/gnocchi
-    branches:
-      - master
-
-openstack-dns:
-    events:
-      - patchset-created
-      - change-merged
-      - x-vrif-minus-2
-    projects:
-      - openstack/designate
-      - openstack/designate-specs
-      - openstack/python-designateclient
-      - stackforge/designate-msdnsagent
-    branches:
-      - master
-
-openstack-trove:
-    events:
-      - patchset-created
-      - change-merged
-      - x-vrif-minus-2
-    projects:
-      - openstack/trove
-      - openstack/trove-specs
-      - openstack/trove-integration
-      - openstack/python-troveclient
-    branches:
-      - master
-
-tripleo:
-    events:
-      - patchset-created
-      - change-merged
-      - x-vrif-minus-2
-    projects:
-      - openstack-infra/tripleo-ci
-      - openstack/diskimage-builder
-      - openstack/os-apply-config
-      - openstack/os-cloud-config
-      - openstack/os-collect-config
-      - openstack/os-net-config
-      - openstack/os-refresh-config
-      - openstack/python-tuskarclient
-      - openstack/tripleo-heat-templates
-      - openstack/tripleo-image-elements
-      - openstack/tripleo-incubator
-      - openstack/tripleo-puppet-elements
-      - openstack/tripleo-specs
-      - openstack/tuskar
-      - openstack/tuskar-ui
-      - stackforge/kolla
-      - stackforge/prep-source-repos
-      - stackforge/puppet-tripleo
-      - stackforge/tripleo-ansible
-      - stackforge/windows-diskimage-builder
-    branches:
-      - master
-
-heat:
-    events:
-      - patchset-created
-      - change-merged
-      - x-vrif-minus-2
-    projects:
-      - openstack/heat
-      - openstack/python-heatclient
-      - openstack/heat-cfntools
-      - openstack/heat-templates
-      - openstack/heat-specs
-      - openstack-dev/heat-cfnclient
-    branches:
-      - master
-
-openstack-neutron:
-    events:
-      - patchset-created
-      - change-merged
-      - x-vrif-minus-2
-    projects:
-      - openstack/neutron
-      - openstack/neutron-fwaas
-      - openstack/neutron-specs
-      - openstack/neutron-vpnaas
-      - openstack/python-neutronclient
-    branches:
-      - master
-
-openstack-horizon:
-    events:
-      - patchset-created
-      - change-merged
-      - x-vrif-minus-2
-    projects:
-      - openstack/horizon
-      - openstack/django_openstack_auth
-      - openstack/tuskar-ui
-    branches:
-      - master
-
-openstack-sahara:
-    events:
-      - patchset-created
-      - change-merged
-      - x-vrif-minus-2
-    projects:
-      - openstack/sahara
-      - openstack/python-saharaclient
-      - openstack/sahara-dashboard
-      - openstack/sahara-extra
-      - openstack/sahara-image-elements
-      - openstack/sahara-specs
-      - stackforge/puppet-sahara
-      - stackforge/sahara-ci-config
-      - stackforge/sahara-guestagent
-    branches:
-      - master
-      - stable/icehouse
-
-openstack-nova:
-    events:
-      - patchset-created
-      - x-vrif-minus-2
-    projects:
-      - openstack/gantt
-      - openstack/nova
-      - openstack/nova-specs
-      - openstack/python-ganttclient
-      - openstack/python-novaclient
-    branches:
-      - master
-
-openstack-cinder:
-    events:
-      - patchset-created
-      - x-vrif-minus-2
-    projects:
-      - openstack/cinder
-      - openstack/cinder-specs
-      - openstack/python-cinderclient
-      - openstack/os-brick
-    branches:
-      - master
-
-openstack-qa:
-    events:
-      - patchset-created
-      - change-merged
-      - x-vrif-minus-2
-    projects:
-      - openstack/qa-specs
-      - openstack/tempest
-      - openstack/tempest-lib
-      - openstack-dev/devstack
-      - openstack-dev/grenade
-      - openstack-dev/hacking
-      - openstack-infra/elastic-recheck
-      - openstack-infra/devstack-gate
-      - openstack-infra/subunit2sql
-    branches:
-      - master
-
-openstack-monasca:
-    events:
-      - patchset-created
-      - change-merged
-      - x-vrif-minus-2
-    projects:
-      - stackforge/monasca-notification
-      - stackforge/python-monascaclient
-      - stackforge/python-monasca-api
-      - stackforge/monasca-api
-      - stackforge/monasca-thresh
-      - stackforge/monasca-ui
-      - stackforge/monasca-common
-      - stackforge/monasca-agent
-      - stackforge/monasca-persister
-    branches:
-      - master
-
-puppet-openstack:
-    events:
-      - patchset-created
-      - change-merged
-      - x-vrif-minus-2
-    projects:
-      - stackforge/puppet-ceilometer
-      - stackforge/puppet-ceph
-      - stackforge/puppet-cinder
-      - stackforge/puppet-designate
-      - stackforge/puppet-glance
-      - stackforge/puppet-gnocchi
-      - stackforge/puppet-heat
-      - stackforge/puppet-horizon
-      - stackforge/puppet-ironic
-      - stackforge/puppet-keystone
-      - stackforge/puppet-manila
-      - stackforge/puppet-monasca
-      - stackforge/puppet-neutron
-      - stackforge/puppet-nova
-      - stackforge/puppet-openstack
-      - stackforge/puppet-openstacklib
-      - stackforge/puppet_openstack_builder
-      - stackforge/puppet-openstack_extras
-      - stackforge/puppet-sahara
-      - stackforge/puppet-swift
-      - stackforge/puppet-tempest
-      - stackforge/puppet-tripleo
-      - stackforge/puppet-trove
-      - stackforge/puppet-tuskar
-      - stackforge/puppet-vswitch
-      - stackforge/puppet-openstack-specs
-    branches:
-      - master
-      - stable/icehouse
-
-openstack-chef:
-    events:
-      - patchset-created
-      - change-merged
-      - x-vrif-minus-2
-    projects:
-      - stackforge/cookbook-openstack-bare-metal
-      - stackforge/cookbook-openstack-block-storage
-      - stackforge/cookbook-openstack-client
-      - stackforge/cookbook-openstack-common
-      - stackforge/cookbook-openstack-compute
-      - stackforge/cookbook-openstack-dashboard
-      - stackforge/cookbook-openstack-data-processing
-      - stackforge/cookbook-openstack-database
-      - stackforge/cookbook-openstack-identity
-      - stackforge/cookbook-openstack-image
-      - stackforge/cookbook-openstack-integration-test
-      - stackforge/cookbook-openstack-network
-      - stackforge/cookbook-openstack-object-storage
-      - stackforge/cookbook-openstack-ops-database
-      - stackforge/cookbook-openstack-ops-messaging
-      - stackforge/cookbook-openstack-orchestration
-      - stackforge/cookbook-openstack-telemetry
-      - stackforge/cookbook-pacemaker
-      - stackforge/openstack-chef-repo
-      - stackforge/openstack-chef-specs
-    branches:
-      - master
-      - stable/icehouse
-      - stable/juno
-
-openstack-merlin:
-    events:
-      - patchset-created
-      - change-merged
-      - x-vrif-minus-2
-    projects:
-      - stackforge/merlin
-    branches:
-      - master
-
-openstack-mistral:
-    events:
-      - patchset-created
-      - change-merged
-      - x-vrif-minus-2
-    projects:
-      - stackforge/mistral
-      - stackforge/mistral-extra
-      - stackforge/python-mistralclient
-    branches:
-      - master
-
-murano:
-    events:
-      - patchset-created
-      - change-merged
-      - x-vrif-minus-2
-    projects:
-      - stackforge/murano
-      - stackforge/murano-agent
-      - stackforge/murano-apps
-      - stackforge/murano-dashboard
-      - stackforge/murano-deployment
-      - stackforge/murano-docs
-      - stackforge/murano-specs
-      - stackforge/python-muranoclient
-    branches:
-      - master
-
-magnetodb:
-    events:
-      - patchset-created
-      - change-merged
-      - x-vrif-minus-2
-    projects:
-      - stackforge/python-magnetodbclient
-      - stackforge/magnetodb
-      - stackforge/magnetodb-specs
-    branches:
-      - master
-
-billingstack:
-    events:
-      - patchset-created
-      - change-merged
-      - x-vrif-minus-2
-    projects:
-      - stackforge/billingstack
-    branches:
-      - master
-
 openstack-ironic:
     events:
       - patchset-created
@@ -498,279 +503,6 @@ openstack-ironic:
     branches:
       - master
 
-openstack-swift:
-    events:
-      - patchset-created
-      - change-merged
-      - x-vrif-minus-2
-    projects:
-      - openstack/python-swiftclient
-      - openstack/swift
-      - openstack/swift-bench
-      - openstack/swift-specs
-    branches:
-      - master
-      - feature/ec
-
-openstack-state-management:
-    events:
-      - patchset-created
-      - change-merged
-      - x-vrif-minus-2
-    projects:
-      - openstack/taskflow
-      - openstack/tooz
-    branches:
-      - master
-
-openstack-barbican:
-    events:
-      - patchset-created
-      - change-merged
-      - x-vrif-minus-2
-    projects:
-      - openstack/barbican
-      - openstack/barbican-specs
-      - openstack/castellan
-      - openstack/kite
-      - openstack/python-barbicanclient
-      - openstack/python-kiteclient
-    branches:
-      - master
-
-fuel-tracker:
-    events:
-      - patchset-created
-      - change-merged
-      - x-vrif-minus-2
-    projects:
-      - stackforge/fuel-web
-      - stackforge/fuel-astute
-      - stackforge/fuel-ostf
-      - stackforge/fuel-main
-      - stackforge/fuel-provision
-      - stackforge/fuel-docs
-      - stackforge/fuel-library
-      - stackforge/fuel-devops
-      - stackforge/fuel-specs
-      - stackforge/fuel-stats
-      - stackforge/fuel-plugins
-      - stackforge/fuel-plugin-cinder-netapp
-      - stackforge/fuel-plugin-contrail
-      - stackforge/fuel-plugin-elasticsearch-kibana
-      - stackforge/fuel-plugin-external-emc
-      - stackforge/fuel-plugin-external-glusterfs
-      - stackforge/fuel-plugin-external-nfs
-      - stackforge/fuel-plugin-external-zabbix
-      - stackforge/fuel-plugin-ha-fencing
-      - stackforge/fuel-plugin-influxdb-grafana
-      - stackforge/fuel-plugin-lma-collector
-      - stackforge/fuel-plugin-mellanox
-      - stackforge/fuel-plugin-neutron-fwaas
-      - stackforge/fuel-plugin-neutron-lbaas
-      - stackforge/fuel-plugin-neutron-vpnaas
-      - stackforge/fuel-qa
-      - stackforge/fuel-tasks-validator
-      - stackforge/python-fuelclient
-    branches:
-      - master
-
-openstack-glance:
-    events:
-      - patchset-created
-      - change-merged
-      - x-vrif-minus-2
-    projects:
-      - openstack/glance
-      - openstack/glance-specs
-      - openstack/glance_store
-      - openstack/python-glanceclient
-    branches:
-      - master
-
-openstack-zaqar:
-    events:
-      - patchset-created
-      - change-merged
-      - x-vrif-minus-2
-    projects:
-      - openstack/zaqar
-      - openstack/zaqar-specs
-      - openstack/python-zaqarclient
-    branches:
-      - master
-
-stackforge-libra:
-    events:
-      - patchset-created
-      - change-merged
-      - x-vrif-minus-2
-    projects:
-      - stackforge/libra
-      - stackforge/python-libraclient
-    branches:
-      - master
-
-openstack-rally:
-    events:
-      - patchset-created
-      - change-merged
-      - x-vrif-minus-2
-    projects:
-      - stackforge/rally
-      - stackforge/python-rallyclient
-    branches:
-      - master
-
-openstack-blazar:
-    events:
-      - patchset-created
-      - change-merged
-      - x-vrif-minus-2
-    projects:
-      - stackforge/blazar
-      - stackforge/blazar-nova
-      - stackforge/python-blazarclient
-    branches:
-      - master
-
-refstack:
-    events:
-      - patchset-created
-      - change-merged
-      - x-vrif-minus-2
-    projects:
-      - stackforge/refstack
-      - stackforge/refstack-client
-    branches:
-      - master
-
-rubick:
-    events:
-      - patchset-created
-      - change-merged
-      - x-vrif-minus-2
-    projects:
-      - stackforge/rubick
-    branches:
-      - master
-
-solum:
-    events:
-      - patchset-created
-      - change-merged
-      - x-vrif-minus-2
-    projects:
-      - stackforge/solum
-      - stackforge/python-solumclient
-      - stackforge/solum-dashboard
-      - stackforge/solum-infra-guestagent
-      - stackforge/solum-specs
-    branches:
-      - master
-
-storyboard:
-    events:
-      - patchset-created
-      - change-merged
-      - x-vrif-minus-2
-    projects:
-      - openstack-infra/python-storyboardclient
-      - openstack-infra/storyboard
-      - openstack-infra/storyboard-webclient
-    branches:
-      - master
-
-surveil:
-    events:
-      - patchset-created
-      - change-merged
-      - x-vrif-minus-2
-    projects:
-      - stackforge/surveil
-      - stackforge/python-surveilclient
-      - stackforge/surveil-specs
-    branches:
-      - master
-
-milk-dev:
-    events:
-      - patchset-created
-      - change-merged
-      - x-vrif-minus-2
-    projects:
-      - stackforge/milk
-    branches:
-      - master
-
-pecanpy:
-    events:
-      - patchset-created
-      - change-merged
-      - x-vrif-minus-2
-    projects:
-      - stackforge/pecan
-    branches:
-      - master
-
-openstack-entropy:
-    events:
-      - patchset-created
-      - change-merged
-      - x-vrif-minus-2
-    projects:
-      - stackforge/entropy
-    branches:
-      - master
-
-packstack-dev:
-    events:
-      - patchset-created
-      - change-merged
-      - x-vrif-minus-2
-    projects:
-      - stackforge/packstack
-    branches:
-      - master
-      - grizzly
-      - havana
-      - icehouse
-
-openstack-anvil:
-    events:
-      - patchset-created
-      - change-merged
-      - x-vrif-minus-2
-    projects:
-      - stackforge/anvil
-    branches:
-      - master
-
-syscompass:
-    events:
-      - patchset-created
-      - change-merged
-      - x-vrif-minus-2
-    projects:
-      - stackforge/compass-adapters
-      - stackforge/compass-core
-      - stackforge/compass-install
-      - stackforge/compass-monit
-      - stackforge/compass-specs
-      - stackforge/compass-web
-    branches:
-      - master
-
-tricircle:
-    events:
-      - patchset-created
-      - change-merged
-      - x-vrif-minus-2
-    projects:
-      - stackforge/tricircle
-    branches:
-      - master
-
 openstack-keystone:
     events:
       - change-merged
@@ -789,6 +521,17 @@ openstack-keystone:
     branches:
       - master
 
+openstack-lbaas:
+    events:
+      - patchset-created
+      - change-merged
+      - x-vrif-minus-2
+    projects:
+      - openstack/neutron-lbaas
+      - stackforge/octavia
+    branches:
+      - master
+
 openstack-manila:
     events:
       - patchset-created
@@ -990,6 +733,73 @@ openstack-merges:
       - openstack/sahara-extra
       - openstack/sahara-image-elements
 
+openstack-merlin:
+    events:
+      - patchset-created
+      - change-merged
+      - x-vrif-minus-2
+    projects:
+      - stackforge/merlin
+    branches:
+      - master
+
+openstack-mistral:
+    events:
+      - patchset-created
+      - change-merged
+      - x-vrif-minus-2
+    projects:
+      - stackforge/mistral
+      - stackforge/mistral-extra
+      - stackforge/python-mistralclient
+    branches:
+      - master
+
+openstack-monasca:
+    events:
+      - patchset-created
+      - change-merged
+      - x-vrif-minus-2
+    projects:
+      - stackforge/monasca-notification
+      - stackforge/python-monascaclient
+      - stackforge/python-monasca-api
+      - stackforge/monasca-api
+      - stackforge/monasca-thresh
+      - stackforge/monasca-ui
+      - stackforge/monasca-common
+      - stackforge/monasca-agent
+      - stackforge/monasca-persister
+    branches:
+      - master
+
+openstack-neutron:
+    events:
+      - patchset-created
+      - change-merged
+      - x-vrif-minus-2
+    projects:
+      - openstack/neutron
+      - openstack/neutron-fwaas
+      - openstack/neutron-specs
+      - openstack/neutron-vpnaas
+      - openstack/python-neutronclient
+    branches:
+      - master
+
+openstack-nova:
+    events:
+      - patchset-created
+      - x-vrif-minus-2
+    projects:
+      - openstack/gantt
+      - openstack/nova
+      - openstack/nova-specs
+      - openstack/python-ganttclient
+      - openstack/python-novaclient
+    branches:
+      - master
+
 openstack-oslo:
     events:
       - patchset-created
@@ -1027,6 +837,64 @@ openstack-oslo:
     branches:
       - master
 
+openstack-poppy:
+    events:
+      - patchset-created
+      - change-merged
+      - x-vrif-minus-2
+    projects:
+      - stackforge/poppy
+    branches:
+      - master
+
+openstack-qa:
+    events:
+      - patchset-created
+      - change-merged
+      - x-vrif-minus-2
+    projects:
+      - openstack/qa-specs
+      - openstack/tempest
+      - openstack/tempest-lib
+      - openstack-dev/devstack
+      - openstack-dev/grenade
+      - openstack-dev/hacking
+      - openstack-infra/elastic-recheck
+      - openstack-infra/devstack-gate
+      - openstack-infra/subunit2sql
+    branches:
+      - master
+
+openstack-rally:
+    events:
+      - patchset-created
+      - change-merged
+      - x-vrif-minus-2
+    projects:
+      - stackforge/rally
+      - stackforge/python-rallyclient
+    branches:
+      - master
+
+openstack-sahara:
+    events:
+      - patchset-created
+      - change-merged
+      - x-vrif-minus-2
+    projects:
+      - openstack/sahara
+      - openstack/python-saharaclient
+      - openstack/sahara-dashboard
+      - openstack/sahara-extra
+      - openstack/sahara-image-elements
+      - openstack/sahara-specs
+      - stackforge/puppet-sahara
+      - stackforge/sahara-ci-config
+      - stackforge/sahara-guestagent
+    branches:
+      - master
+      - stable/icehouse
+
 openstack-satori:
     events:
       - patchset-created
@@ -1064,24 +932,217 @@ openstack-security:
     branches:
       - master
 
-nova-docker:
+openstack-state-management:
     events:
       - patchset-created
       - change-merged
       - x-vrif-minus-2
     projects:
-      - stackforge/nova-docker
+      - openstack/taskflow
+      - openstack/tooz
     branches:
       - master
 
-openstack-lbaas:
+openstack-swift:
     events:
       - patchset-created
       - change-merged
       - x-vrif-minus-2
     projects:
-      - openstack/neutron-lbaas
-      - stackforge/octavia
+      - openstack/python-swiftclient
+      - openstack/swift
+      - openstack/swift-bench
+      - openstack/swift-specs
+    branches:
+      - master
+      - feature/ec
+
+openstack-trove:
+    events:
+      - patchset-created
+      - change-merged
+      - x-vrif-minus-2
+    projects:
+      - openstack/trove
+      - openstack/trove-specs
+      - openstack/trove-integration
+      - openstack/python-troveclient
+    branches:
+      - master
+
+openstack-zaqar:
+    events:
+      - patchset-created
+      - change-merged
+      - x-vrif-minus-2
+    projects:
+      - openstack/zaqar
+      - openstack/zaqar-specs
+      - openstack/python-zaqarclient
+    branches:
+      - master
+
+packstack-dev:
+    events:
+      - patchset-created
+      - change-merged
+      - x-vrif-minus-2
+    projects:
+      - stackforge/packstack
+    branches:
+      - master
+      - grizzly
+      - havana
+      - icehouse
+
+pecanpy:
+    events:
+      - patchset-created
+      - change-merged
+      - x-vrif-minus-2
+    projects:
+      - stackforge/pecan
+    branches:
+      - master
+
+puppet-openstack:
+    events:
+      - patchset-created
+      - change-merged
+      - x-vrif-minus-2
+    projects:
+      - stackforge/puppet-ceilometer
+      - stackforge/puppet-ceph
+      - stackforge/puppet-cinder
+      - stackforge/puppet-designate
+      - stackforge/puppet-glance
+      - stackforge/puppet-gnocchi
+      - stackforge/puppet-heat
+      - stackforge/puppet-horizon
+      - stackforge/puppet-ironic
+      - stackforge/puppet-keystone
+      - stackforge/puppet-manila
+      - stackforge/puppet-monasca
+      - stackforge/puppet-neutron
+      - stackforge/puppet-nova
+      - stackforge/puppet-openstack
+      - stackforge/puppet-openstacklib
+      - stackforge/puppet_openstack_builder
+      - stackforge/puppet-openstack_extras
+      - stackforge/puppet-sahara
+      - stackforge/puppet-swift
+      - stackforge/puppet-tempest
+      - stackforge/puppet-tripleo
+      - stackforge/puppet-trove
+      - stackforge/puppet-tuskar
+      - stackforge/puppet-vswitch
+      - stackforge/puppet-openstack-specs
+    branches:
+      - master
+      - stable/icehouse
+
+refstack:
+    events:
+      - patchset-created
+      - change-merged
+      - x-vrif-minus-2
+    projects:
+      - stackforge/refstack
+      - stackforge/refstack-client
+    branches:
+      - master
+
+rubick:
+    events:
+      - patchset-created
+      - change-merged
+      - x-vrif-minus-2
+    projects:
+      - stackforge/rubick
+    branches:
+      - master
+
+solum:
+    events:
+      - patchset-created
+      - change-merged
+      - x-vrif-minus-2
+    projects:
+      - stackforge/solum
+      - stackforge/python-solumclient
+      - stackforge/solum-dashboard
+      - stackforge/solum-infra-guestagent
+      - stackforge/solum-specs
+    branches:
+      - master
+
+stackforge-libra:
+    events:
+      - patchset-created
+      - change-merged
+      - x-vrif-minus-2
+    projects:
+      - stackforge/libra
+      - stackforge/python-libraclient
+    branches:
+      - master
+
+storyboard:
+    events:
+      - patchset-created
+      - change-merged
+      - x-vrif-minus-2
+    projects:
+      - openstack-infra/python-storyboardclient
+      - openstack-infra/storyboard
+      - openstack-infra/storyboard-webclient
+    branches:
+      - master
+
+striker-dev:
+    events:
+      - patchset-created
+      - change-merged
+      - x-vrif-minus-2
+    projects:
+      - stackforge/striker
+    branches:
+      - master
+
+surveil:
+    events:
+      - patchset-created
+      - change-merged
+      - x-vrif-minus-2
+    projects:
+      - stackforge/surveil
+      - stackforge/python-surveilclient
+      - stackforge/surveil-specs
+    branches:
+      - master
+
+swiftonfile:
+    events:
+      - patchset-created
+      - change-merged
+      - x-vrif-minus-2
+    projects:
+      - stackforge/swiftonfile
+    branches:
+      - master
+
+syscompass:
+    events:
+      - patchset-created
+      - change-merged
+      - x-vrif-minus-2
+    projects:
+      - stackforge/compass-adapters
+      - stackforge/compass-core
+      - stackforge/compass-install
+      - stackforge/compass-monit
+      - stackforge/compass-specs
+      - stackforge/compass-web
     branches:
       - master
 
@@ -1097,102 +1158,41 @@ tacker:
     branches:
       - master
 
-congress:
+tricircle:
     events:
       - patchset-created
       - change-merged
       - x-vrif-minus-2
     projects:
-      - stackforge/congress
-      - stackforge/python-congressclient
-      - stackforge/congress-specs
-      - stackforge/python-cloudfoundryclient
+      - stackforge/tricircle
     branches:
       - master
 
-git-upstream:
+tripleo:
     events:
       - patchset-created
       - change-merged
       - x-vrif-minus-2
     projects:
-      - stackforge/git-upstream
-    branches:
-      - master
-
-openstack-poppy:
-    events:
-      - patchset-created
-      - change-merged
-      - x-vrif-minus-2
-    projects:
-      - stackforge/poppy
-    branches:
-      - master
-
-swiftonfile:
-    events:
-      - patchset-created
-      - change-merged
-      - x-vrif-minus-2
-    projects:
-      - stackforge/swiftonfile
-    branches:
-      - master
-
-dox:
-    events:
-      - patchset-created
-      - change-merged
-      - x-vrif-minus-2
-    projects:
-      - stackforge/dox
-    branches:
-      - master
-
-striker-dev:
-    events:
-      - patchset-created
-      - change-merged
-      - x-vrif-minus-2
-    projects:
-      - stackforge/striker
-    branches:
-      - master
-
-openstack-ansible:
-    events:
-      - patchset-created
-      - change-merged
-      - x-vrif-minus-2
-    projects:
-      - stackforge/os-ansible-deployment
-    branches:
-      - master
-      - icehouse
-      - juno
-      - kilo
-
-openstack-gbp:
-    events:
-      - patchset-created
-      - change-merged
-      - x-vrif-minus-2
-    projects:
-      - stackforge/group-based-policy
-      - stackforge/group-based-policy-specs
-      - stackforge/group-based-policy-ui
-      - stackforge/group-based-policy-automation
-      - stackforge/python-group-based-policy-client
-    branches:
-      - master
-
-openstack-hyper-v:
-    events:
-      - patchset-created
-      - change-merged
-      - x-vrif-minus-2
-    projects:
-      - stackforge/networking-hyperv
+      - openstack-infra/tripleo-ci
+      - openstack/diskimage-builder
+      - openstack/os-apply-config
+      - openstack/os-cloud-config
+      - openstack/os-collect-config
+      - openstack/os-net-config
+      - openstack/os-refresh-config
+      - openstack/python-tuskarclient
+      - openstack/tripleo-heat-templates
+      - openstack/tripleo-image-elements
+      - openstack/tripleo-incubator
+      - openstack/tripleo-puppet-elements
+      - openstack/tripleo-specs
+      - openstack/tuskar
+      - openstack/tuskar-ui
+      - stackforge/kolla
+      - stackforge/prep-source-repos
+      - stackforge/puppet-tripleo
+      - stackforge/tripleo-ansible
+      - stackforge/windows-diskimage-builder
     branches:
       - master