diff --git a/modules/openstack_project/files/review.projects.yaml b/modules/openstack_project/files/review.projects.yaml
index 07beb61f01..5b14093388 100644
--- a/modules/openstack_project/files/review.projects.yaml
+++ b/modules/openstack_project/files/review.projects.yaml
@@ -40,37 +40,44 @@
   description: Tech community metrics dash of the OpenStack community based on the Metrics Grimoire toolset
   upstream: git://github.com/Bitergia/openstack-dashboard.git
 - project: openstack-infra/askbot-theme
-  group: openstack-ci
+  groups:
+    - openstack-ci
   description: Theme for ask.openstack.org.
   upstream: https://bitbucket.org/askbot/openstack-theme
   options:
     - direct-release
 - project: openstack-infra/bugdaystats
-  group: openstack-ci
+  groups:
+    - openstack-ci
   description: Tool to produce static HTML that shows progress during a Bug Day
   upstream: git://github.com/ttx/bugdaystats.git
   options:
     - direct-release
 - project: openstack-infra/config
-  group: openstack-ci
+  groups:
+    - openstack-ci
   options:
     - direct-release
 - project: openstack-infra/devstack-gate
-  group: openstack-ci
+  groups:
+    - openstack-ci
   options:
     - direct-release
 - project: openstack-infra/elastic-recheck
-  group: openstack-ci
+  groups:
+    - openstack-ci
   upstream: git://github.com/jogo/elasticRecheck
   description: Classify tempest-devstack failures using ElasticSearch
 - project: openstack-infra/gear
-  group: openstack-ci
+  groups:
+    - openstack-ci
   description: Pure-Python asynchronous interface to Gearman
 - project: openstack-infra/gearman-plugin
   description: The jenkins gearman plugin
   use-storyboard: true
 - project: openstack-infra/gerrit
-  group: openstack-ci
+  groups:
+    - openstack-ci
   description: Fork of Gerrit used by OpenStack
   upstream: https://gerrit.googlesource.com/gerrit
   upstream-prefix: upstream
@@ -83,17 +90,21 @@
   options:
     - direct-release
 - project: openstack-infra/gerritbot
-  group: openstack-ci
+  groups:
+    - openstack-ci
   options:
     - direct-release
 - project: openstack-infra/gerritlib
-  group: openstack-ci
+  groups:
+    - openstack-ci
   options:
     - direct-release
 - project: openstack-infra/git-review
-  group: openstack-ci
+  groups:
+    - openstack-ci
 - project: openstack-infra/gitdm
-  group: openstack-ci
+  groups:
+    - openstack-ci
   description: A fork of Jonathan Corbet's gitdm for OpenStack
   upstream: git://github.com/markmc/openstack-gitdm.git
   options:
@@ -107,33 +118,41 @@
   upstream: git://github.com/mkissam/groups-static-pages
   use-storyboard: true
 - project: openstack-infra/infra-manual
-  group: openstack-ci
+  groups:
+    - openstack-ci
   options:
     - direct-release
 - project: openstack-infra/infra-specs
-  group: openstack-ci
+  groups:
+    - openstack-ci
   description: OpenStack Infrastructure Blueprint Repository
   use-storyboard: true
 - project: openstack-infra/jeepyb
-  group: openstack-ci
+  groups:
+    - openstack-ci
   upstream: git://github.com/emonty/gerritx.git
   description: Gerrit Project Builder Tools
 - project: openstack-infra/jenkins-job-builder
-  group: openstack-ci
+  groups:
+    - openstack-ci
 - project: openstack-infra/lodgeit
-  group: openstack-ci
+  groups:
+    - openstack-ci
   options:
     - direct-release
 - project: openstack-infra/meetbot
-  group: openstack-ci
+  groups:
+    - openstack-ci
   options:
     - direct-release
 - project: openstack-infra/nodepool
-  group: openstack-ci
+  groups:
+    - openstack-ci
   description: Manage a pool of nodes for a distributed test infrastructure
   use-storyboard: true
 - project: openstack-infra/nose-html-output
-  group: openstack-ci
+  groups:
+    - openstack-ci
   options:
     - direct-release
 - project: openstack-infra/odsreg
@@ -141,38 +160,50 @@
   description: OpenStack Design Summit session management system
 - project: openstack-infra/openstackid
   description: Authentication system for the OpenStack Foundation site
-  group: openstack-org
+  groups:
+    - openstack-org
   upstream: git://github.com/smarcet/openstackid.git
 - project: openstack-infra/os-loganalyze
-  group: openstack-ci
+  groups:
+    - openstack-ci
   description: log analyzer tools for logs.openstack.org
   upstream: git://github.com/sdague/os_loganalyze.git
 - project: openstack-infra/publications
-  group: openstack-ci
+  groups:
+    - openstack-ci
   description: OpenStack Infra Team conference presentations and papers
   options:
     - direct-release
 - project: openstack-infra/puppet-apparmor
-  group: openstack-ci
+  groups:
+    - openstack-ci
 - project: openstack-infra/puppet-dashboard
-  group: openstack-ci
+  groups:
+    - openstack-ci
 - project: openstack-infra/puppet-storyboard
   description: Puppet module to deploy storyboard
   use-storyboard: true
-  group: openstack-ci
+  groups:
+    - openstack-ci
+    - storyboard
 - project: openstack-infra/puppet-vcsrepo
-  group: openstack-ci
+  groups:
+    - openstack-ci
 - project: openstack-infra/puppet-vinz
   description: Puppet module to deploy vinz
-  group: openstack-ci
+  groups:
+    - openstack-ci
 - project: openstack-infra/puppet-yum
-  group: openstack-ci
+  groups:
+    - openstack-ci
   upstream: git://github.com/dprince/puppet-yum.git
 - project: openstack-infra/puppet-zuul
   description: Puppet module to install and configure zuul
-  group: openstack-ci
+  groups:
+    - openstack-ci
 - project: openstack-infra/pypi-mirror
-  group: openstack-ci
+  groups:
+    - openstack-ci
   upstream: git://github.com/openstack-infra/jeepyb.git
   description: PyPI mirror builder
 - project: openstack-infra/release-tools
@@ -182,7 +213,8 @@
   upstream: git://github.com/ttx/releasestatus.git
   description: OpenStack Release Status page generator
 - project: openstack-infra/reviewday
-  group: openstack-ci
+  groups:
+    - openstack-ci
   upstream: git://github.com/dprince/reviewday.git
   description: OpenStack code review report generator
   options:
@@ -191,7 +223,8 @@
   description: Scripts for generating OpenStack development community statistics
   upstream: git://github.com/russellb/openstack-stats.git
 - project: openstack-infra/statusbot
-  group: openstack-ci
+  groups:
+    - openstack-ci
   description: Infrastructure status update IRC bot
   options:
     - direct-release
@@ -199,11 +232,15 @@
   upstream: git://github.com/ttx/storyboard.git
   use-storyboard: true
   description: OpenStack Task Tracking API
+  groups:
+    - storyboard
 - project: openstack-infra/storyboard-webclient
   acl-config: /home/gerrit2/acls/openstack-infra/storyboard.config
   upstream: git://github.com/krotscheck/storyboard-webclient.git
   description: OpenStack Task Tracking Browser Client
   use-storyboard: true
+  groups:
+    - storyboard
 - project: openstack-infra/subunit2sql
   description: Tooling for converting subunit streams into a SQL DB
   upstream: https://github.com/mtreinish/subunit2sql
@@ -218,18 +255,22 @@
   description: Standalone UI replacment for Gerrit
   use-storyboard: true
 - project: openstack-infra/zmq-event-publisher
-  group: openstack-ci
+  groups:
+    - openstack-ci
   description: Jenkins plugin to publish build events via ZMQ PUB SUB.
   upstream: git://github.com/cboylan/zmq-event-publisher.git
 - project: openstack-infra/zuul
-  group: openstack-ci
+  groups:
+    - openstack-ci
   use-storyboard: true
 - project: openstack-infra/zuul-packaging
-  group: openstack-ci
+  groups:
+    - openstack-ci
   upstream: git://github.com/pabelanger/zuul-packaging.git
   description: Zuul packaging
 - project: openstack/api-site
-  group: openstack-api-site
+  groups:
+    - openstack-api-site
   options:
     - direct-release
 - project: openstack/barbican
@@ -241,16 +282,20 @@
 - project: openstack/ceilometer
   docimpact-group: openstack-manuals
 - project: openstack/ceilometer-specs
-  group: ceilometer
+  groups:
+    - ceilometer
 - project: openstack/cinder
   docimpact-group: openstack-manuals
 - project: openstack/cinder-specs
-  group: cinder
+  groups:
+    - cinder
 - project: openstack/cliff
   description: Command Line Interface Formulation Framework
-  group: python-cliff
+  groups:
+    - python-cliff
 - project: openstack/compute-api
-  group: openstack-api-site
+  groups:
+    - openstack-api-site
   options:
     - direct-release
 - project: openstack/designate
@@ -261,11 +306,13 @@
 - project: openstack/diskimage-builder
   description: Image building tools for OpenStack
 - project: openstack/django_openstack_auth
-  group: django-openstack-auth
+  groups:
+    - django-openstack-auth
   description: A Django authentication backend for use with the OpenStack Keystone Identity backend.
   upstream: git://github.com/gabrielhurley/django_openstack_auth.git
 - project: openstack/docs-specs
-  group: openstack-manuals
+  groups:
+    - openstack-manuals
   upstream: https://github.com/annegentle/docs-specs.git
 - project: openstack/gantt
   description: Common scheduler for OpenStack.
@@ -275,12 +322,14 @@
 - project: openstack/glance-specs
 - project: openstack/glance_store
   description: Glance stores library
-  group: glance
+  groups:
+    - glance
   acl-config: /home/gerrit2/acls/openstack/python-glanceclient.config
 - project: openstack/governance
   description: OpenStack Technical Committee Decisions
 - project: openstack/ha-guide
-  group: openstack-manuals
+  groups:
+    - openstack-manuals
   upstream: git://github.com/ajaeger/ha-guide.git
   description: OpenStack High Availability Guide
   options:
@@ -289,16 +338,19 @@
 - project: openstack/heat-cfntools
   upstream: git://github.com/heat-api/heat-cfntools.git
 - project: openstack/heat-specs
-  group: heat
+  groups:
+    - heat
 - project: openstack/heat-templates
 - project: openstack/horizon
   docimpact-group: openstack-manuals
 - project: openstack/identity-api
-  group: openstack-api-site
+  groups:
+    - openstack-api-site
   options:
     - direct-release
 - project: openstack/image-api
-  group: openstack-api-site
+  groups:
+    - openstack-api-site
   options:
     - direct-release
 - project: openstack/ironic
@@ -307,13 +359,16 @@
 - project: openstack/ironic-python-agent
   description: A python agent for provisioning and deprovisioning Bare Metal servers.
   upstream: git://github.com/rackerlabs/teeth-agent.git
-  group: ironic
+  groups:
+    - ironic
 - project: openstack/ironic-specs
-  group: ironic
+  groups:
+    - ironic
 - project: openstack/keystone
   docimpact-group: openstack-manuals
 - project: openstack/keystone-specs
-  group: keystone
+  groups:
+    - keystone
 - project: openstack/keystonemiddleware
   description: OpenStack Identity (Keystone) Middleware
   upstream: git://github.com/morganfainberg/keystonemiddleware
@@ -322,25 +377,30 @@
 - project: openstack/manila
   description: Shared filesystem management project for OpenStack.
 - project: openstack/netconn-api
-  group: openstack-api-site
+  groups:
+    - openstack-api-site
   options:
     - direct-release
 - project: openstack/neutron
   docimpact-group: openstack-manuals
 - project: openstack/neutron-specs
-  group: neutron
+  groups:
+    - neutron
 - project: openstack/nova
   docimpact-group: openstack-manuals
 - project: openstack/nova-specs
-  group: nova
+  groups:
+    - nova
 - project: openstack/object-api
-  group: openstack-api-site
+  groups:
+    - openstack-api-site
   options:
     - direct-release
 - project: openstack/openstack
   upstream: git://github.com/emonty/openstack
 - project: openstack/openstack-doc-tools
-  group: openstack-manuals
+  groups:
+    - openstack-manuals
   description: Tools used by OpenStack Documentation
   upstream: git://github.com/ajaeger/openstack-doc-tools.git
   options:
@@ -350,7 +410,8 @@
     - direct-release
 - project: openstack/openstack-planet
 - project: openstack/operations-guide
-  group: openstack-manuals
+  groups:
+    - openstack-manuals
   upstream: git://github.com/jeblair/openstack-ops
   description: OpenStack Operations Guide
   options:
@@ -370,25 +431,30 @@
   description: Restart services and coordinate data migration on Heat config changes.
   acl-config: /home/gerrit2/acls/openstack/os-apply-config.config
 - project: openstack/oslo-incubator
-  group: oslo
+  groups:
+    - oslo
   docimpact-group: openstack-manuals
   description: Part of OpenStack's Oslo project. New Oslo APIs go through an incubation phase in this repository before being released as part of a proper Python library.
 - project: openstack/oslo-specs
-  group: oslo
+  groups:
+    - oslo
   upstream: git://github.com/dhellmann/oslo-specs.git
 - project: openstack/oslo.concurrency
   description: OpenStack library for all concurrency-related code
-  group: oslo
+  groups:
+    - oslo
   upstream: git://github.com/YorikSar/oslo.concurrency.git
 - project: openstack/oslo.config
   docimpact-group: openstack-manuals
 - project: openstack/oslo.db
   description: OpenStack Common DB Code
-  group: oslo
+  groups:
+    - oslo
   upstream: git://github.com/malor/oslo.db.git
 - project: openstack/oslo.i18n
   description: Internationalization and translation library.
-  group: oslo
+  groups:
+    - oslo
   docimpact-group: openstack-manuals
   upstream: https://github.com/dhellmann/oslo.i18n.git
 - project: openstack/oslo.log
@@ -400,22 +466,26 @@
   upstream: git://github.com/markmc/oslo.messaging.git
 - project: openstack/oslo.middleware
   description: OpenStack middleware library
-  group: oslo
+  groups:
+    - oslo
   upstream: https://github.com/chungg/oslo.middleware.git
 - project: openstack/oslo.rootwrap
   docimpact-group: openstack-manuals
   upstream: git://github.com/ttx/oslo.rootwrap.git
 - project: openstack/oslo.serialization
-  group: oslo
+  groups:
+    - oslo
   upstream: https://github.com/cybertron/oslo.serialization.git
 - project: openstack/oslo.utils
-  group: oslo
+  groups:
+    - oslo
   upstream: git://github.com/dims/oslo.utils.git
 - project: openstack/oslo.version
   docimpact-group: openstack-manuals
   upstream: git://github.com/emonty/oslo.version.git
 - project: openstack/oslo.vmware
-  group: oslo
+  groups:
+    - oslo
   description: Oslo VMware library for OpenStack projects
   upstream: git://github.com/dims/oslo.vmware.git
 - project: openstack/oslosphinx
@@ -423,7 +493,8 @@
   description: Theme and utilities for Sphinx documentation tool
 - project: openstack/oslotest
   description: OpenStack test classes
-  group: oslo
+  groups:
+    - oslo
   upstream: git://github.com/dhellmann/oslo.test.git
 - project: openstack/pycadf
   description: CADF Python module
@@ -476,32 +547,39 @@
   upstream: git://github.com/tuskar/python-tuskarclient.git
 - project: openstack/python-zaqarclient
 - project: openstack/qa-specs
-  group: tempest
+  groups:
+    - tempest
 - project: openstack/requirements
 - project: openstack/sahara
   description: Sahara aims to provide users with simple means to provision a Hadoop cluster by specifying several parameters like Hadoop version, cluster topology, nodes hardware details and a few more.
   acl-config: /home/gerrit2/acls/openstack/sahara.config
 - project: openstack/sahara-dashboard
-  group: sahara
+  groups:
+    - sahara
   description: Sahara Horizon plugin.
   acl-config: /home/gerrit2/acls/openstack/sahara-etc.config
 - project: openstack/sahara-extra
-  group: sahara
+  groups:
+    - sahara
   description: Repo for sahara-related utils.
   acl-config: /home/gerrit2/acls/openstack/sahara-etc.config
 - project: openstack/sahara-image-elements
-  group: sahara
+  groups:
+    - sahara
   description: Disk image elements for Sahara
   acl-config: /home/gerrit2/acls/openstack/sahara-etc.config
 - project: openstack/sahara-specs
-  group: sahara
+  groups:
+    - sahara
 - project: openstack/security-doc
   description: Documentation work from the OpenStack Security Group (OSSG)
-  group: openstack-manuals
+  groups:
+    - openstack-manuals
   options:
     - direct-release
 - project: openstack/stevedore
-  group: python-stevedore
+  groups:
+    - python-stevedore
   description: Manage dynamic plugins for Python applications
 - project: openstack/swift
   docimpact-group: openstack-manuals
@@ -509,7 +587,8 @@
   description: Benchmarking tool for OpenStack Swift
   upstream: git://github.com/jeblair/swift-bench.git
 - project: openstack/swift-specs
-  group: swift
+  groups:
+    - swift
 - project: openstack/taskflow
   description: A library to complete workflows/tasks in HA manner
   upstream: git://github.com/eglynn/telemetry-specs.git
@@ -519,7 +598,8 @@
 - project: openstack/tempest-lib
   description: A library to assist in creating functional or integrated test suites for OpenStack projects.
   upstream: git://github.com/mtreinish/tempest-lib.git
-  group: tempest
+  groups:
+    - tempest
   acl-config: /home/gerrit2/acls/openstack/tempest.config
 - project: openstack/training-guides
   description: Community created, open source training guides for OpenStack.
@@ -527,18 +607,22 @@
   options:
     - direct-release
 - project: openstack/tripleo-heat-templates
-  group: tripleo
+  groups:
+    - tripleo
   description: Heat templates for deploying OpenStack
 - project: openstack/tripleo-image-elements
-  group: tripleo
+  groups:
+    - tripleo
   description: Disk image elements for deployment images of OpenStack
 - project: openstack/tripleo-incubator
-  group: tripleo
+  groups:
+    - tripleo
   description: The TripleO incubator where unformed things are experimented with.
   options:
     - direct-release
 - project: openstack/tripleo-specs
-  group: tripleo
+  groups:
+    - tripleo
   upstream: git://github.com/derekhiggins/tripleo-specs.git
 - project: openstack/trove
   docimpact-group: openstack-manuals
@@ -553,12 +637,14 @@
   description: The UI component for Tuskar
   upstream: git://github.com/tuskar/tuskar-ui.git
 - project: openstack/volume-api
-  group: openstack-api-site
+  groups:
+    - openstack-api-site
   options:
     - direct-release
 - project: openstack/zaqar
 - project: openstack/zaqar-specs
-  group: zaqar
+  groups:
+    - zaqar
 - project: stackforge-attic/murano-common
 - project: stackforge-attic/murano-conductor
 - project: stackforge-attic/murano-metadataclient
@@ -612,21 +698,25 @@
   upstream: https://github.com/samu4924/cloudroast
   description: Automated Test Case Repository for OpenStack. Based on CloudCAFE.
 - project: stackforge/compass-adapters
-  group: compass
+  groups:
+    - compass
   description: Compass adapter related code and data (chef, cobbler, etc)
   upstream: git://github.com/huawei-cloud/compass-adapters.git
   acl-config: /home/gerrit2/acls/stackforge/compass.config
 - project: stackforge/compass-core
-  group: compass
+  groups:
+    - compass
   description: Automating Distributed System Deployment to Baremetal Resources
   upstream: git://github.com/huawei-cloud/compass-core.git
   acl-config: /home/gerrit2/acls/stackforge/compass.config
 - project: stackforge/compass-monit
-  group: compass
+  groups:
+    - compass
   description: Compass related monitoring
   acl-config: /home/gerrit2/acls/stackforge/compass.config
 - project: stackforge/compass-web
-  group: compass
+  groups:
+    - compass
   description: A web-based UI consuming the Restful API service provided by Compass
   upstream: git://github.com/huawei-cloud/compass-web.git
   acl-config: /home/gerrit2/acls/stackforge/compass.config
@@ -637,7 +727,8 @@
 - project: stackforge/congress-specs
   description: Congress Design Specifications
 - project: stackforge/cookbook-ceph
-  group: openstack-chef
+  groups:
+    - openstack-chef
   docimpact-group: openstack-chef
   description: Chef Cookbook - Ceph
   upstream: git://github.com/ceph/ceph-cookbooks.git
@@ -646,120 +737,139 @@
     - direct-release
 - project: stackforge/cookbook-monasca-agent
   description: Chef Cookbook - Monasca Agent
-  group: monasca
+  groups:
+    - monasca
   upstream: git://github.com/hpcloud-mon/cookbooks-mon_agent
   acl-config: /home/gerrit2/acls/stackforge/monasca.config
 - project: stackforge/cookbook-monasca-api
   description: Chef Cookbook - Monasca REST API
-  group: monasca
+  groups:
+    - monasca
   upstream: git://github.com/hpcloud-mon/cookbooks-mon_api
   acl-config: /home/gerrit2/acls/stackforge/monasca.config
 - project: stackforge/cookbook-monasca-notification
   description: Chef Cookbook - Monasca Notification Engine
-  group: monasca
+  groups:
+    - monasca
   upstream: git://github.com/hpcloud-mon/cookbooks-mon_notification
   acl-config: /home/gerrit2/acls/stackforge/monasca.config
 - project: stackforge/cookbook-monasca-persister
   description: Chef Cookbook - Monasca Database Persister
-  group: monasca
+  groups:
+    - monasca
   upstream: git://github.com/hpcloud-mon/cookbooks-mon_persister
   acl-config: /home/gerrit2/acls/stackforge/monasca.config
 - project: stackforge/cookbook-monasca-schema
   description: Chef Cookbook - Monasca Database Schemas
-  group: monasca
+  groups:
+    - monasca
   upstream: git://github.com/hpcloud-mon/cookbook-monasca-schema
   acl-config: /home/gerrit2/acls/stackforge/monasca.config
 - project: stackforge/cookbook-monasca-thresh
   description: Chef Cookbook - Monasca Thresholding Engine
-  group: monasca
+  groups:
+    - monasca
   upstream: git://github.com/hpcloud-mon/cookbooks-mon_thresh
   acl-config: /home/gerrit2/acls/stackforge/monasca.config
 - project: stackforge/cookbook-openstack-block-storage
-  group: openstack-chef
+  groups:
+    - openstack-chef
   docimpact-group: openstack-chef
   description: Chef Cookbook - OpenStack Block Storage
   acl-config: /home/gerrit2/acls/stackforge/chef-cookbooks.config
   options:
     - direct-release
 - project: stackforge/cookbook-openstack-client
-  group: openstack-chef
+  groups:
+    - openstack-chef
   docimpact-group: openstack-chef
   description: Chef Cookbook - OpenStack client Resources
   acl-config: /home/gerrit2/acls/stackforge/chef-cookbooks.config
   options:
     - direct-release
 - project: stackforge/cookbook-openstack-common
-  group: openstack-chef
+  groups:
+    - openstack-chef
   docimpact-group: openstack-chef
   description: Chef Cookbook - common OpenStack configuration
   acl-config: /home/gerrit2/acls/stackforge/chef-cookbooks.config
   options:
     - direct-release
 - project: stackforge/cookbook-openstack-compute
-  group: openstack-chef
+  groups:
+    - openstack-chef
   docimpact-group: openstack-chef
   description: Chef Cookbook - OpenStack Compute
   acl-config: /home/gerrit2/acls/stackforge/chef-cookbooks.config
   options:
     - direct-release
 - project: stackforge/cookbook-openstack-dashboard
-  group: openstack-chef
+  groups:
+    - openstack-chef
   docimpact-group: openstack-chef
   description: Chef Cookbook - OpenStack Dashboard
   acl-config: /home/gerrit2/acls/stackforge/chef-cookbooks.config
   options:
     - direct-release
 - project: stackforge/cookbook-openstack-data-processing
-  group: openstack-chef
+  groups:
+    - openstack-chef
   docimpact-group: openstack-chef
   description: Chef Cookbook - OpenStack Data Processing Service
   acl-config: /home/gerrit2/acls/stackforge/chef-cookbooks.config
   options:
     - direct-release
 - project: stackforge/cookbook-openstack-database
-  group: openstack-chef
+  groups:
+    - openstack-chef
   docimpact-group: openstack-chef
   description: Chef Cookbook - OpenStack Database as a Service
   acl-config: /home/gerrit2/acls/stackforge/chef-cookbooks.config
   options:
     - direct-release
 - project: stackforge/cookbook-openstack-identity
-  group: openstack-chef
+  groups:
+    - openstack-chef
   docimpact-group: openstack-chef
   description: Chef Cookbook - OpenStack Identity
   acl-config: /home/gerrit2/acls/stackforge/chef-cookbooks.config
   options:
     - direct-release
 - project: stackforge/cookbook-openstack-image
-  group: openstack-chef
+  groups:
+    - openstack-chef
   docimpact-group: openstack-chef
   description: Chef Cookbook - OpenStack Image
   acl-config: /home/gerrit2/acls/stackforge/chef-cookbooks.config
   options:
     - direct-release
 - project: stackforge/cookbook-openstack-integration-test
-  group: openstack-chef
+  groups:
+    - openstack-chef
   docimpact-group: openstack-chef
   description: Chef Cookbook - OpenStack Integration Testing
   acl-config: /home/gerrit2/acls/stackforge/chef-cookbooks.config
   options:
     - direct-release
 - project: stackforge/cookbook-openstack-network
-  group: openstack-chef
+  groups:
+    - openstack-chef
   docimpact-group: openstack-chef
   description: Chef Cookbook - OpenStack Network
   acl-config: /home/gerrit2/acls/stackforge/chef-cookbooks.config
   options:
     - direct-release
 - project: stackforge/cookbook-openstack-object-storage
-  group: openstack-chef
+  groups:
+    - openstack-chef
   docimpact-group: openstack-chef
   description: Chef Cookbook - OpenStack Object Storage
   acl-config: /home/gerrit2/acls/stackforge/chef-cookbooks.config
   options:
     - direct-release
 - project: stackforge/cookbook-openstack-ops-database
-  group: openstack-chef
+  groups:
+    - openstack-chef
   docimpact-group: openstack-chef
   description: Chef Cookbook - Support Cookbook for Database
   acl-config: /home/gerrit2/acls/stackforge/chef-cookbooks.config
@@ -767,7 +877,8 @@
   options:
     - direct-release
 - project: stackforge/cookbook-openstack-ops-messaging
-  group: openstack-chef
+  groups:
+    - openstack-chef
   docimpact-group: openstack-chef
   description: Chef Cookbook - Support Cookbook for Messaging
   acl-config: /home/gerrit2/acls/stackforge/chef-cookbooks.config
@@ -775,14 +886,16 @@
   options:
     - direct-release
 - project: stackforge/cookbook-openstack-orchestration
-  group: openstack-chef
+  groups:
+    - openstack-chef
   docimpact-group: openstack-chef
   description: Chef Cookbook - OpenStack Orchestration
   acl-config: /home/gerrit2/acls/stackforge/chef-cookbooks.config
   options:
     - direct-release
 - project: stackforge/cookbook-openstack-telemetry
-  group: openstack-chef
+  groups:
+    - openstack-chef
   docimpact-group: openstack-chef
   description: Chef Cookbook - OpenStack Telemetry
   acl-config: /home/gerrit2/acls/stackforge/chef-cookbooks.config
@@ -808,49 +921,59 @@
   description: OpenStack Swift incremental backup and restore automation tool for file system, MongoDB, MySQL. LVM snapshot and encryption support.
   upstream: git://git.code.sf.net/p/openstack-freezer/freezer
 - project: stackforge/fuel-astute
-  group: fuel
+  groups:
+    - fuel
   description: Fuel orchestrator
   upstream: git://github.com/Mirantis/astute.git
   acl-config: /home/gerrit2/acls/stackforge/fuel.config
 - project: stackforge/fuel-devops
-  group: fuel
+  groups:
+    - fuel
   description: Fuel DevOps tools for managing virtual environments
   upstream: git://github.com/Mirantis/devops.git
   acl-config: /home/gerrit2/acls/stackforge/fuel.config
 - project: stackforge/fuel-docs
-  group: fuel
+  groups:
+    - fuel
   description: Fuel Documentation
   upstream: git://github.com/Mirantis/fuel-docs.git
   acl-config: /home/gerrit2/acls/stackforge/fuel.config
 - project: stackforge/fuel-library
-  group: fuel
+  groups:
+    - fuel
   description: Fuel Library
   upstream: git://github.com/Mirantis/fuel.git
   acl-config: /home/gerrit2/acls/stackforge/fuel.config
 - project: stackforge/fuel-main
-  group: fuel
+  groups:
+    - fuel
   description: Fuel is the control plane for installing and managing OpenStack. It is capable of doing bare metal provisioning of physical nodes, installing OpenStack on them, and much more.
   upstream: git://github.com/Mirantis/fuel-main.git
   acl-config: /home/gerrit2/acls/stackforge/fuel.config
 - project: stackforge/fuel-ostf
-  group: fuel
+  groups:
+    - fuel
   upstream: git://github.com/Mirantis/fuel-ostf-tests.git
   acl-config: /home/gerrit2/acls/stackforge/fuel.config
 - project: stackforge/fuel-ostf-plugin
-  group: fuel
+  groups:
+    - fuel
   description: Obsolete repo, please, take a look at fuel-ostf
   acl-config: /home/gerrit2/acls/stackforge/fuel.config
 - project: stackforge/fuel-provision
-  group: fuel
+  groups:
+    - fuel
   description: Fuel provisioning system.
   upstream: git://github.com/Mirantis/fuel-provision.git
   acl-config: /home/gerrit2/acls/stackforge/fuel.config
 - project: stackforge/fuel-specs
-  group: fuel
+  groups:
+    - fuel
   description: Fuel designs and specs
   acl-config: /home/gerrit2/acls/stackforge/fuel.config
 - project: stackforge/fuel-web
-  group: fuel
+  groups:
+    - fuel
   description: Fuel UI
   upstream: git://github.com/Mirantis/fuelweb.git
   acl-config: /home/gerrit2/acls/stackforge/fuel.config
@@ -922,83 +1045,100 @@
   acl-config: /home/gerrit2/acls/stackforge/mistral.config
 - project: stackforge/mistral-dashboard
   description: Mistral Horizon plugin.
-  group: mistral
+  groups:
+    - mistral
   upstream: git://github.com/nmakhotkin/mistral-dashboard.git
   acl-config: /home/gerrit2/acls/stackforge/mistral.config
 - project: stackforge/mistral-extra
   description: Additional tools and examples for Mistral workflow engine.
-  group: mistral
+  groups:
+    - mistral
   upstream: git://github.com/rakhmerov/mistral-extra.git
   acl-config: /home/gerrit2/acls/stackforge/mistral.config
 - project: stackforge/monasca-agent
   description: Agent for Monasca
-  group: monasca
+  groups:
+    - monasca
   upstream: git://github.com/hpcloud-mon/mon-agent
   acl-config: /home/gerrit2/acls/stackforge/monasca.config
 - project: stackforge/monasca-api
   description: Monasca REST API
-  group: monasca
+  groups:
+    - monasca
   upstream: git://github.com/hpcloud-mon/mon-api
   acl-config: /home/gerrit2/acls/stackforge/monasca.config
 - project: stackforge/monasca-ceilometer
   description: Integration between Monasca and Ceilometer
-  group: monasca
+  groups:
+    - monasca
   upstream: git://github.com/hpcloud-mon/mon-ceilometer
   acl-config: /home/gerrit2/acls/stackforge/monasca.config
 - project: stackforge/monasca-common
   description: Monasca common classes
-  group: monasca
+  groups:
+    - monasca
   upstream: git://github.com/hpcloud-mon/mon-common
   acl-config: /home/gerrit2/acls/stackforge/monasca.config
 - project: stackforge/monasca-notification
   description: Notification Engine for Monasca
-  group: monasca
+  groups:
+    - monasca
   upstream: git://github.com/hpcloud-mon/mon-notification
   acl-config: /home/gerrit2/acls/stackforge/monasca.config
 - project: stackforge/monasca-persister
   description: Monasca Database Persister
-  group: monasca
+  groups:
+    - monasca
   upstream: git://github.com/hpcloud-mon/mon-persister
   acl-config: /home/gerrit2/acls/stackforge/monasca.config
 - project: stackforge/monasca-statsd
   description: Python Statsd library for sending statsd messages via the Monasca Agent
-  group: monasca
+  groups:
+    - monasca
   acl-config: /home/gerrit2/acls/stackforge/monasca.config
 - project: stackforge/monasca-thresh
   description: Monasca Thresholding Engine
-  group: monasca
+  groups:
+    - monasca
   upstream: git://github.com/hpcloud-mon/mon-thresh
   acl-config: /home/gerrit2/acls/stackforge/monasca.config
 - project: stackforge/monasca-ui
   description: Horizon UI for Monasca
-  group: monasca
+  groups:
+    - monasca
   upstream: git://github.com/hpcloud-mon/mon-ui
   acl-config: /home/gerrit2/acls/stackforge/monasca.config
 - project: stackforge/monasca-vagrant
   description: Vagrant test environment for Monasca
-  group: monasca
+  groups:
+    - monasca
   upstream: git://github.com/hpcloud-mon/mon-vagrant
   acl-config: /home/gerrit2/acls/stackforge/monasca.config
 - project: stackforge/MRaaS
 - project: stackforge/murano
   upstream: git://github.com/Mirantis/murano-api.git
 - project: stackforge/murano-agent
-  group: murano
+  groups:
+    - murano
   upstream: git://github.com/Mirantis/murano-agent.git
   acl-config: /home/gerrit2/acls/stackforge/murano.config
 - project: stackforge/murano-apps
-  group: murano
+  groups:
+    - murano
   acl-config: /home/gerrit2/acls/stackforge/murano.config
 - project: stackforge/murano-dashboard
-  group: murano
+  groups:
+    - murano
   upstream: git://github.com/Mirantis/murano-dashboard.git
   acl-config: /home/gerrit2/acls/stackforge/murano.config
 - project: stackforge/murano-deployment
-  group: murano
+  groups:
+    - murano
   upstream: git://github.com/Mirantis/murano-deployment.git
   acl-config: /home/gerrit2/acls/stackforge/murano.config
 - project: stackforge/murano-docs
-  group: murano
+  groups:
+    - murano
   upstream: git://github.com/Mirantis/murano-docs.git
   acl-config: /home/gerrit2/acls/stackforge/murano.config
 - project: stackforge/namos
@@ -1021,14 +1161,16 @@
   upstream: https://github.com/samu4924/opencafe
   description: Common Automation Framework Engine. Core driver for CloudCAFE
 - project: stackforge/openstack-chef-repo
-  group: openstack-chef
+  groups:
+    - openstack-chef
   docimpact-group: openstack-chef
   description: Example Chef Repo that sets up an OpenStack Deployment
   acl-config: /home/gerrit2/acls/stackforge/chef-cookbooks.config
   options:
     - direct-release
 - project: stackforge/openstack-chef-specs
-  group: openstack-chef
+  groups:
+    - openstack-chef
   docimpact-group: openstack-chef
   description: Openstack Chef Blueprint specs
   acl-config: /home/gerrit2/acls/stackforge/chef-cookbooks.config
@@ -1126,20 +1268,24 @@
   acl-config: /home/gerrit2/acls/stackforge/puppet-modules.config
   upstream: git://github.com/hogepodge/puppet-openstack-specs
 - project: stackforge/puppet-openstacklib
-  group: puppet-openstack
+  groups:
+    - puppet-openstack
   description: Module for Common Puppet OpenStack Dependencies
   acl-config: /home/gerrit2/acls/stackforge/puppet-modules.config
 - project: stackforge/puppet-openstack_dev_env
-  group: puppet-openstack
+  groups:
+    - puppet-openstack
   description: OpenStack Puppet Dev Environment
   acl-config: /home/gerrit2/acls/stackforge/puppet-modules.config
   upstream: git://github.com/puppetlabs/puppetlabs-openstack_dev_env.git
 - project: stackforge/puppet-openstack_extras
-  group: puppet-openstack
+  groups:
+    - puppet-openstack
   description: Helper classes that utilize the core Puppet Openstack modules
   acl-config: /home/gerrit2/acls/stackforge/puppet-modules.config
 - project: stackforge/puppet-sahara
-  group: sahara
+  groups:
+    - sahara
   description: Sahara Puppet Module
   acl-config: /home/gerrit2/acls/openstack/sahara.config
 - project: stackforge/puppet-swift
@@ -1185,16 +1331,19 @@
   upstream: git://github.com/aostapenko/python-magnetodbclient
 - project: stackforge/python-mistralclient
   description: Python client for Mistral REST API.
-  group: mistral
+  groups:
+    - mistral
   upstream: git://github.com/rakhmerov/python-mistralclient.git
   acl-config: /home/gerrit2/acls/stackforge/mistral.config
 - project: stackforge/python-monascaclient
   description: Python client for Monasca REST API.
-  group: monasca
+  groups:
+    - monasca
   upstream: git://github.com/hpcloud-mon/python-monclient
   acl-config: /home/gerrit2/acls/stackforge/monasca.config
 - project: stackforge/python-muranoclient
-  group: murano
+  groups:
+    - murano
   upstream: git://github.com/Mirantis/python-muranoclient.git
   acl-config: /home/gerrit2/acls/stackforge/murano.config
 - project: stackforge/python-openstacksdk
@@ -1207,14 +1356,16 @@
   upstream: https://github.com/ctc-g/python-rackclient.git
   acl-config: /home/gerrit2/acls/stackforge/rack.config
 - project: stackforge/python-rallyclient
-  group: rally
+  groups:
+    - rally
   acl-config: /home/gerrit2/acls/stackforge/rally.config
 - project: stackforge/python-solumclient
   description: 'Client library to Solum API. See: https://wiki.openstack.org/wiki/Solum'
   upstream: https://github.com/noorul/python-solumclient.git
 - project: stackforge/python-surveilclient
 - project: stackforge/python-tackerclient
-  group: tacker
+  groups:
+    - tacker
 - project: stackforge/rack
   description: Provides the ability that can control OpenStack as program resource with an application. It enables you to implement a large scale distributed system in a variety of programming languages on OpenStack.
   upstream: https://github.com/ctc-g/rack
@@ -1342,7 +1493,8 @@
 - project: stackforge/tacker
   description: "tacker: specifications a servicevm/device life cycle manager. See https://wiki.openstack.org/wiki/ServiceVM"
 - project: stackforge/tacker-specs
-  group: tacker
+  groups:
+    - tacker
   upstream: https://github.com/yamahata/tacker-specs.git
 - project: stackforge/tomograph
   description: "Library to help distributed applications send trace information to metrics backends like Zipkin and Statsd."
@@ -1350,14 +1502,17 @@
 - project: stackforge/tooz
   description: Coordinate distributed systems.
 - project: stackforge/tricircle
-  group: tricircle
+  groups:
+    - tricircle
   description: Tricircle is a project for OpenStack cascading solution.
 - project: stackforge/tripleo-ansible
-  group: tripleo-ansible
+  groups:
+    - tripleo-ansible
   description: Update a TripleO installation using Ansible.
   upstream: https://github.com/SpamapS/tripleo-ansible.git
 - project: stackforge/turbo-hipster
-  group: turbo-hipster
+  groups:
+    - turbo-hipster
   docimpact-group: turbo-hipster
   description: A generic zuul worker using the gearman protocol.
   upstream: git://github.com/rcbau/turbo-hipster.git