diff --git a/gerrit/acls/openstack-infra/puppet-infra-cookiecutter.config b/gerrit/acls/openstack-infra/puppet-infra-cookiecutter.config
new file mode 100644
index 0000000000..b8a01f5011
--- /dev/null
+++ b/gerrit/acls/openstack-infra/puppet-infra-cookiecutter.config
@@ -0,0 +1,10 @@
+[access "refs/heads/*"]
+abandon = group puppet-infra-cookiecutter-core
+label-Code-Review = -2..+2 group puppet-infra-cookiecutter-core
+label-Workflow = -1..+1 group puppet-infra-cookiecutter-core
+
+[receive]
+requireChangeId = true
+
+[submit]
+mergeContent = true
diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml
index 88cfc360d3..3d58a0d657 100755
--- a/gerrit/projects.yaml
+++ b/gerrit/projects.yaml
@@ -365,6 +365,11 @@
   description: Puppet modules for deploying Apache in OpenStack infrastructure
   groups:
     - openstack-ci
+- project: openstack-infra/puppet-infra-cookiecutter
+  use-storyboard: true
+  description: Cookiecutter template for compliant OpenStack-infra puppet-modules
+  groups:
+    - openstack-ci
 - project: openstack-infra/puppet-iptables
   use-storyboard: true
   description: Puppet module for iptables
diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml
index b1687cc42e..5da8c77bd3 100755
--- a/gerritbot/channels.yaml
+++ b/gerritbot/channels.yaml
@@ -625,6 +625,7 @@ openstack-infra:
       - openstack-infra/puppet-haveged
       - openstack-infra/puppet-hound
       - openstack-infra/puppet-httpd
+      - openstack-infra/puppet-infra-cookiecutter
       - openstack-infra/puppet-iptables
       - openstack-infra/puppet-jeepyb
       - openstack-infra/puppet-jenkins
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index fa37759b88..bb018b18c3 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -5621,6 +5621,11 @@ projects:
     release:
       - puppet-httpd-forge-upload
 
+  - name: openstack-infra/puppet-infra-cookiecutter
+    template:
+      - name: merge-check
+      - name: noop-jobs
+
   - name: openstack-infra/puppet-iptables
     template:
       - name: merge-check