diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/group-based-policy.config b/modules/openstack_project/files/gerrit/acls/stackforge/group-based-policy.config
new file mode 100644
index 0000000000..6a4ee5b291
--- /dev/null
+++ b/modules/openstack_project/files/gerrit/acls/stackforge/group-based-policy.config
@@ -0,0 +1,14 @@
+[access "refs/heads/*"]
+abandon = group group-based-policy-core
+label-Code-Review = -2..+2 group group-based-policy-core
+label-Workflow = -1..+1 group group-based-policy-core
+
+[access "refs/tags/*"]
+pushSignedTag = group group-based-policy-release
+
+[receive]
+requireChangeId = true
+requireContributorAgreement = true
+
+[submit]
+mergeContent = true
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
index 70bd00788a..c7a916c6c0 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -3233,3 +3233,18 @@
     jobs:
       - python-jobs
       - pypi-jobs
+
+- project:
+    name: group-based-policy
+    node: 'bare-precise || bare-trusty'
+    tarball-site: tarballs.openstack.org
+
+- project:
+    name: python-group-based-policy-client
+    node: 'bare-precise || bare-trusty'
+    tarball-site: tarballs.openstack.org
+
+- project:
+    name: group-based-policy-specs
+    node: 'bare-precise || bare-trusty'
+    tarball-site: tarballs.openstack.org
diff --git a/modules/openstack_project/files/review.projects.yaml b/modules/openstack_project/files/review.projects.yaml
index 0427ffa121..75225f827d 100644
--- a/modules/openstack_project/files/review.projects.yaml
+++ b/modules/openstack_project/files/review.projects.yaml
@@ -833,6 +833,11 @@
   description: OpenStack API client for golang
 - project: stackforge/graffiti
   description: Cloud Capability Service
+- project: stackforge/group-based-policy
+  description: Group Based Policy
+- project: stackforge/group-based-policy-specs
+  description: Group Based Policy Design Specifications
+  acl-config: /home/gerrit2/acls/stackforge/group-based-policy.config
 - project: stackforge/healthnmon
   description: Healthnmon aims to deliver 'Cloud Resource Monitor', an extensible service to OpenStack Cloud Operating system by providing monitoring service for Cloud Resources and Infrastructure with a pluggable framework for 'Inventory Management', 'Alerts and notifications' and 'Utilization Data.'
   upstream: git://github.com/healthnmon/healthnmon.git
@@ -1109,6 +1114,9 @@
   acl-config: /home/gerrit2/acls/stackforge/cloudkitty.config
 - project: stackforge/python-congressclient
   description: Client for OpenStack Congress
+- project: stackforge/python-group-based-policy-client
+  description: Client for OpenStack Group Based Policy
+  acl-config: /home/gerrit2/acls/stackforge/group-based-policy.config
 - project: stackforge/python-jenkins
   upstream: git://github.com/jeblair/python-jenkins.git
   description: Python API for managing jobs and nodes in a Jenkins CI instance
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 1b9d057299..bb5b6f6884 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -3928,6 +3928,16 @@ projects:
       - gate-gnocchi-tox-py27-postgresql
       - gate-gnocchi-tox-py27-mysql
 
+  - name: stackforge/group-based-policy
+    template:
+      - name: merge-check
+      - name: noop-jobs
+
+  - name: stackforge/group-based-policy-specs
+    template:
+      - name: merge-check
+      - name: noop-jobs
+
   - name: stackforge/healthnmon
     template:
       - name: merge-check
@@ -4093,6 +4103,11 @@ projects:
       - gate-python-congressclient-pep8
       - gate-python-congressclient-python27
 
+  - name: stackforge/python-group-based-policy-client
+    template:
+      - name: merge-check
+      - name: noop-jobs
+
   - name: stackforge/python-mistralclient
     template:
       - name: merge-check