diff --git a/gerrit/acls/openstack/tripleo-common.config b/gerrit/acls/openstack/instack.config
similarity index 100%
rename from gerrit/acls/openstack/tripleo-common.config
rename to gerrit/acls/openstack/instack.config
diff --git a/gerrit/acls/openstack/tripleo-heat-templates.config b/gerrit/acls/openstack/tripleo-heat-templates.config
deleted file mode 100644
index f8f6ae6941..0000000000
--- a/gerrit/acls/openstack/tripleo-heat-templates.config
+++ /dev/null
@@ -1,21 +0,0 @@
-[access "refs/heads/*"]
-abandon = group diskimage-builder-core
-label-Code-Review = -2..+2 group diskimage-builder-core
-label-Workflow = -1..+1 group diskimage-builder-core
-
-[access "refs/heads/stable/*"]
-abandon = group tripleo-core
-exclusiveGroupPermissions = abandon label-Code-Review label-Workflow
-label-Code-Review = -2..+2 group tripleo-core
-label-Code-Review = -1..+1 group Registered Users
-label-Workflow = -1..+1 group tripleo-core
-
-[access "refs/tags/*"]
-pushSignedTag = group tripleo-release
-
-[receive]
-requireChangeId = true
-requireContributorAgreement = true
-
-[submit]
-mergeContent = true
diff --git a/gerrit/acls/openstack/tripleo-puppet-elements.config b/gerrit/acls/openstack/tripleo-puppet-elements.config
deleted file mode 100644
index 12c86e4734..0000000000
--- a/gerrit/acls/openstack/tripleo-puppet-elements.config
+++ /dev/null
@@ -1,14 +0,0 @@
-[access "refs/heads/*"]
-abandon = group tripleo-core
-label-Code-Review = -2..+2 group tripleo-core
-label-Workflow = -1..+1 group tripleo-core
-
-[access "refs/tags/*"]
-pushSignedTag = group tripleo-release
-
-[receive]
-requireChangeId = true
-requireContributorAgreement = true
-
-[submit]
-mergeContent = true
diff --git a/gerrit/acls/openstack/tripleo.config b/gerrit/acls/openstack/tripleo.config
index 12c86e4734..3d9b7969f0 100644
--- a/gerrit/acls/openstack/tripleo.config
+++ b/gerrit/acls/openstack/tripleo.config
@@ -1,8 +1,16 @@
 [access "refs/heads/*"]
 abandon = group tripleo-core
+create = group tripleo-release
 label-Code-Review = -2..+2 group tripleo-core
 label-Workflow = -1..+1 group tripleo-core
 
+[access "refs/heads/stable/*"]
+abandon = group tripleo-core
+exclusiveGroupPermissions = abandon label-Code-Review label-Workflow
+label-Code-Review = -2..+2 group tripleo-core
+label-Code-Review = -1..+1 group Registered Users
+label-Workflow = -1..+1 group tripleo-core
+
 [access "refs/tags/*"]
 pushSignedTag = group tripleo-release
 
diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml
index dc0a100215..470f8bd145 100755
--- a/gerrit/projects.yaml
+++ b/gerrit/projects.yaml
@@ -2685,6 +2685,7 @@
   description: Tricircle is a project for OpenStack Multiple Site Deployment solution.
 - project: openstack/tripleo-common
   description: A Python library for code common for TripleO CLI and Tuskar UI.
+  acl-config: /home/gerrit2/acls/openstack/tripleo.config
 - project: openstack/tripleo-docs
   groups:
     - tripleo
@@ -2694,6 +2695,7 @@
   groups:
     - tripleo
   description: Heat templates for deploying OpenStack
+  acl-config: /home/gerrit2/acls/openstack/tripleo.config
 - project: openstack/tripleo-image-elements
   groups:
     - tripleo
@@ -2708,6 +2710,7 @@
   groups:
     - tripleo
   description: Puppet elements for deployment of OpenStack
+  acl-config: /home/gerrit2/acls/openstack/tripleo.config
 - project: openstack/tripleo-specs
   groups:
     - tripleo