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 c9bc845196..65252ad1db 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -455,7 +455,7 @@
 - project:
     name: heat
     github-org: openstack
-    node: precise
+    node: bare-precise
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
 
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 2e6dae9c69..649998c91a 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -190,15 +190,15 @@ jobs:
     parameter-function: single_use_node
   - name: gate-ci-docs
     parameter-function: single_use_node
-  - name: '^gate-(cinder|glance|keystone|nova|savanna)-docs$'
+  - name: '^gate-(cinder|glance|heat|keystone|nova|savanna)-docs$'
     parameter-function: single_use_node
-  - name: '^gate-(cinder|glance|keystone|nova|savanna)-pep8$'
+  - name: '^gate-(cinder|glance|heat|keystone|nova|savanna)-pep8$'
     parameter-function: single_use_node
-  - name: '^gate-(cinder|glance|keystone|nova|savanna)-pylint$'
+  - name: '^gate-(cinder|glance|heat|keystone|nova|savanna)-pylint$'
     parameter-function: single_use_node
-  - name: '^gate-(cinder|glance|keystone|nova|savanna)-python27$'
+  - name: '^gate-(cinder|glance|heat|keystone|nova|savanna)-python27$'
     parameter-function: single_use_node
-  - name: '^(cinder|glance|keystone|nova|savanna)-coverage$'
+  - name: '^(cinder|glance|heat|keystone|nova|savanna)-coverage$'
     parameter-function: single_use_node
 # end section to deal with transition to bare-precise
   - name: ^(gate|check)-requirements-integration-dsvm$