diff --git a/gerrit/acls/openstack-infra/puppet-apparmor.config b/gerrit/acls/openstack-infra/puppet-apparmor.config
deleted file mode 100644
index e194eee4cb..0000000000
--- a/gerrit/acls/openstack-infra/puppet-apparmor.config
+++ /dev/null
@@ -1,17 +0,0 @@
-[access "refs/heads/*"]
-abandon = group infra-core
-label-Code-Review = -2..+2 group infra-core
-label-Workflow = -1..+1 group infra-core
-
-[access "refs/meta/config"]
-abandon = group infra-core
-label-Code-Review = -2..+2 group infra-core
-label-Verified = -2..+2 group infra-core
-label-Workflow = -1..+1 group infra-core
-submit = group infra-core
-
-[receive]
-requireChangeId = true
-
-[submit]
-mergeContent = true
diff --git a/gerrit/acls/openstack-infra/puppet-dashboard.config b/gerrit/acls/openstack-infra/puppet-dashboard.config
deleted file mode 100644
index e194eee4cb..0000000000
--- a/gerrit/acls/openstack-infra/puppet-dashboard.config
+++ /dev/null
@@ -1,17 +0,0 @@
-[access "refs/heads/*"]
-abandon = group infra-core
-label-Code-Review = -2..+2 group infra-core
-label-Workflow = -1..+1 group infra-core
-
-[access "refs/meta/config"]
-abandon = group infra-core
-label-Code-Review = -2..+2 group infra-core
-label-Verified = -2..+2 group infra-core
-label-Workflow = -1..+1 group infra-core
-submit = group infra-core
-
-[receive]
-requireChangeId = true
-
-[submit]
-mergeContent = true
diff --git a/gerrit/acls/openstack-infra/puppet-storyboard.config b/gerrit/acls/openstack-infra/puppet-storyboard.config
deleted file mode 100644
index b8f0f04c33..0000000000
--- a/gerrit/acls/openstack-infra/puppet-storyboard.config
+++ /dev/null
@@ -1,10 +0,0 @@
-[access "refs/heads/*"]
-abandon = group infra-core
-label-Code-Review = -2..+2 group infra-core
-label-Workflow = -1..+1 group infra-core
-
-[receive]
-requireChangeId = true
-
-[submit]
-mergeContent = true
diff --git a/gerrit/acls/openstack-infra/puppet-vcsrepo.config b/gerrit/acls/openstack-infra/puppet-vcsrepo.config
deleted file mode 100644
index ae3a66c6e2..0000000000
--- a/gerrit/acls/openstack-infra/puppet-vcsrepo.config
+++ /dev/null
@@ -1,20 +0,0 @@
-[access "refs/heads/*"]
-abandon = group infra-core
-label-Code-Review = -2..+2 group infra-core
-label-Workflow = -1..+1 group infra-core
-
-[access "refs/meta/config"]
-abandon = group infra-core
-label-Code-Review = -2..+2 group infra-core
-label-Verified = -2..+2 group infra-core
-label-Workflow = -1..+1 group infra-core
-submit = group infra-core
-
-[access "refs/tags/*"]
-pushSignedTag = group infra-core
-
-[receive]
-requireChangeId = true
-
-[submit]
-mergeContent = true
diff --git a/gerrit/acls/openstack-infra/puppet-vinz.config b/gerrit/acls/openstack-infra/puppet-vinz.config
deleted file mode 100644
index b8f0f04c33..0000000000
--- a/gerrit/acls/openstack-infra/puppet-vinz.config
+++ /dev/null
@@ -1,10 +0,0 @@
-[access "refs/heads/*"]
-abandon = group infra-core
-label-Code-Review = -2..+2 group infra-core
-label-Workflow = -1..+1 group infra-core
-
-[receive]
-requireChangeId = true
-
-[submit]
-mergeContent = true
diff --git a/gerrit/acls/openstack-infra/puppet-yum.config b/gerrit/acls/openstack-infra/puppet-yum.config
deleted file mode 100644
index 27dc079338..0000000000
--- a/gerrit/acls/openstack-infra/puppet-yum.config
+++ /dev/null
@@ -1,14 +0,0 @@
-[access "refs/heads/*"]
-abandon = group infra-core
-label-Code-Review = -2..+2 group infra-core
-label-Workflow = -1..+1 group infra-core
-
-[access "refs/tags/*"]
-pushSignedTag = group infra-core
-
-[receive]
-requireChangeId = true
-requireContributorAgreement = true
-
-[submit]
-mergeContent = true
diff --git a/gerrit/acls/openstack-infra/puppet-zuul.config b/gerrit/acls/openstack-infra/puppet-zuul.config
deleted file mode 100644
index b8f0f04c33..0000000000
--- a/gerrit/acls/openstack-infra/puppet-zuul.config
+++ /dev/null
@@ -1,10 +0,0 @@
-[access "refs/heads/*"]
-abandon = group infra-core
-label-Code-Review = -2..+2 group infra-core
-label-Workflow = -1..+1 group infra-core
-
-[receive]
-requireChangeId = true
-
-[submit]
-mergeContent = true
diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml
index 68a7ca2aba..bb97796bc7 100644
--- a/gerrit/projects.yaml
+++ b/gerrit/projects.yaml
@@ -175,9 +175,11 @@
   options:
     - direct-release
 - project: openstack-infra/puppet-apparmor
+  acl-config: /home/gerrit2/acls/openstack-infra/puppet-system.config
   groups:
     - openstack-ci
 - project: openstack-infra/puppet-dashboard
+  acl-config: /home/gerrit2/acls/openstack-infra/puppet-system.config
   groups:
     - openstack-ci
 - project: openstack-infra/puppet-pip
@@ -188,22 +190,27 @@
     - openstack-ci
 - project: openstack-infra/puppet-storyboard
   description: Puppet module to deploy storyboard
+  acl-config: /home/gerrit2/acls/openstack-infra/puppet-system.config
   use-storyboard: true
   groups:
     - openstack-ci
     - storyboard
 - project: openstack-infra/puppet-vcsrepo
+  acl-config: /home/gerrit2/acls/openstack-infra/puppet-system.config
   groups:
     - openstack-ci
 - project: openstack-infra/puppet-vinz
   description: Puppet module to deploy vinz
+  acl-config: /home/gerrit2/acls/openstack-infra/puppet-system.config
   groups:
     - openstack-ci
 - project: openstack-infra/puppet-yum
+  acl-config: /home/gerrit2/acls/openstack-infra/puppet-system.config
   groups:
     - openstack-ci
   upstream: git://github.com/dprince/puppet-yum.git
 - project: openstack-infra/puppet-zuul
+  acl-config: /home/gerrit2/acls/openstack-infra/puppet-system.config
   description: Puppet module to install and configure zuul
   groups:
     - openstack-ci