diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/modules/gerritbot/files/gerritbot_channel_config.yaml
index a71dfa0848..e3066c50da 100644
--- a/modules/gerritbot/files/gerritbot_channel_config.yaml
+++ b/modules/gerritbot/files/gerritbot_channel_config.yaml
@@ -220,6 +220,7 @@ puppet-openstack:
       - stackforge/puppet-ceilometer
       - stackforge/puppet-cinder
       - stackforge/puppet-glance
+      - stackforge/puppet-heat
       - stackforge/puppet-horizon
       - stackforge/puppet-keystone
       - stackforge/puppet-nova
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 1810d6437c..80b72a7cad 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -993,6 +993,17 @@
       - gate-{name}-puppet-syntax
       - puppet-module-unit
 
+- project:
+    name: puppet-heat
+    github-org: stackforge
+    node: precise
+    tarball-site: tarballs.openstack.org
+
+    jobs:
+      - gate-{name}-puppet-lint
+      - gate-{name}-puppet-syntax
+      - puppet-module-unit
+
 - project:
     name: puppet-nova
     github-org: stackforge
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 9f1544a8d7..50b476ea11 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -2016,6 +2016,20 @@ projects:
       - gate-puppet-glance-puppet-unit-3.0
       - gate-puppet-glance-puppet-unit-3.1
 
+  - name: stackforge/puppet-heat
+    check:
+      - gate-puppet-heat-puppet-lint
+      - gate-puppet-heat-puppet-syntax
+      - gate-puppet-heat-puppet-unit-2.7
+      - gate-puppet-heat-puppet-unit-3.0
+      - gate-puppet-heat-puppet-unit-3.1
+    gate:
+      - gate-puppet-heat-puppet-lint
+      - gate-puppet-heat-puppet-syntax
+      - gate-puppet-heat-puppet-unit-2.7
+      - gate-puppet-heat-puppet-unit-3.0
+      - gate-puppet-heat-puppet-unit-3.1
+
   - name: stackforge/puppet-horizon
     check:
       - gate-puppet-horizon-puppet-lint
diff --git a/modules/openstack_project/templates/review.projects.yaml.erb b/modules/openstack_project/templates/review.projects.yaml.erb
index b700580fde..9b2e03401f 100644
--- a/modules/openstack_project/templates/review.projects.yaml.erb
+++ b/modules/openstack_project/templates/review.projects.yaml.erb
@@ -207,6 +207,10 @@
   description: OpenStack Glance Puppet Module
   acl-config: /home/gerrit2/acls/stackforge/puppet-modules.config
   upstream: git://github.com/puppetlabs/puppetlabs-glance.git
+- project: stackforge/puppet-heat
+  description: OpenStack Heat Puppet Module
+  acl-config: /home/gerrit2/acls/stackforge/puppet-modules.config
+  upstream: git://github.com/enovance/puppet-heat.git
 - project: stackforge/puppet-horizon
   description: OpenStack Horizon Puppet Module
   acl-config: /home/gerrit2/acls/stackforge/puppet-modules.config