diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/openstackid.config b/modules/openstack_project/files/gerrit/acls/openstack-infra/openstackid.config
new file mode 100644
index 0000000000..5e48e5f33c
--- /dev/null
+++ b/modules/openstack_project/files/gerrit/acls/openstack-infra/openstackid.config
@@ -0,0 +1,12 @@
+[access "refs/heads/*"]
+        label-Code-Review = -2..+2 group openstackid-core
+        label-Approved = +0..+1 group openstackid-core
+        workInProgress = group openstackid-core
+[access "refs/tags/*"]
+        create = group openstackid-ptl
+        pushTag = group openstackid-ptl
+[receive]
+        requireChangeId = true
+        requireContributorAgreement = true
+[submit]
+        mergeContent = true
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index e220d6b195..46a17218a2 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -3744,6 +3744,12 @@ projects:
     gate:
       - gate-noop
 
+  - name: openstack-infra/openstackid
+    check:
+      - gate-noop
+    gate:
+      - gate-noop
+
   - name: stackforge/wsme
     check:
       - gate-wsme-python26
diff --git a/modules/openstack_project/templates/review.projects.yaml.erb b/modules/openstack_project/templates/review.projects.yaml.erb
index 3191c3595e..fefd3b4d1f 100644
--- a/modules/openstack_project/templates/review.projects.yaml.erb
+++ b/modules/openstack_project/templates/review.projects.yaml.erb
@@ -88,6 +88,10 @@
 - project: openstack-infra/odsreg
   upstream: git://github.com/ttx/odsreg.git
   description: OpenStack Design Summit session management system
+- project: openstack-infra/openstackid
+  description: Authentication system for the OpenStack Foundation site
+  launchpad: openstack-org
+  upstream: git://github.com/smarcet/openstackid.git
 - project: openstack-infra/os-loganalyze
   launchpad: openstack-ci
   description: log analyzer tools for logs.openstack.org