diff --git a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
index 76b9cf7f17..4de9f531ee 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
@@ -62,6 +62,11 @@
     builders:
       - shell: "/usr/local/jenkins/slave_scripts/run-pyflakes.sh {github-org} {project}"
 
+- builder:
+    name: puppet-lint
+    builders:
+      - shell: "rake lint"
+
 - builder:
     name: puppet-syntax
     builders:
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/openstack-ci-puppet.yaml b/modules/openstack_project/files/jenkins_job_builder/config/openstack-ci-puppet.yaml
index 241544e2fd..ba76ac79a2 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/openstack-ci-puppet.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/openstack-ci-puppet.yaml
@@ -1,36 +1,3 @@
-- job:
-    name: gate-config-syntax
-    node: quantal
-
-    triggers:
-      - zuul
-
-    builders:
-      - gerrit-git-prep
-      - puppet-syntax
-      - pyflakes:
-          github-org: openstack-infra
-          project: config
-
-    publishers:
-      - console-log
-
-
-- job:
-    name: gate-config-lint
-    node: quantal
-
-    triggers:
-      - zuul
-
-    builders:
-      - gerrit-git-prep
-      - shell: "rake lint"
-
-    publishers:
-      - console-log
-
-
 - job:
     name: config-compare-xml
     node: quantal
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 56e90cd765..91957095eb 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -8,6 +8,16 @@
       - gate-{name}-python26
       - gate-{name}-python27
 
+- project:
+    name: config
+    github-org: openstack-infra
+    node: quantal
+
+    jobs:
+      - gate-{name}-puppet-lint
+      - gate-{name}-puppet-syntax
+      - gate-{name}-pyflakes
+
 - project:
     name: savanna
     github-org: stackforge
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/puppet-module-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/puppet-module-jobs.yaml
index e39209eed8..567a700574 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/puppet-module-jobs.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/puppet-module-jobs.yaml
@@ -18,7 +18,33 @@
     publishers:
       - console-log
 
+- job-template:
+    name: 'gate-{name}-puppet-lint'
+    node: '{node}'
 
+    triggers:
+      - zuul
+
+    builders:
+      - gerrit-git-prep
+      - puppet-lint
+
+    publishers:
+      - console-log
+
+- job-template:
+    name: 'gate-{name}-puppet-syntax'
+    node: '{node}'
+
+    triggers:
+      - zuul
+
+    builders:
+      - gerrit-git-prep
+      - puppet-syntax
+
+    publishers:
+      - console-log
 
 - job-group:
     name: 'puppet-module-unit'
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 6b51bf5d29..2c46d2182d 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -256,14 +256,16 @@ projects:
   - name: openstack-infra/config
     merge-mode: cherry-pick
     check:
-      - gate-config-syntax
-      - gate-config-lint
-      - gate-config-layout
       - config-compare-xml
-    gate:
-      - gate-config-syntax
-      - gate-config-lint
       - gate-config-layout
+      - gate-config-puppet-lint
+      - gate-config-puppet-syntax
+      - gate-config-pyflakes
+    gate:
+      - gate-config-layout
+      - gate-config-puppet-lint
+      - gate-config-puppet-syntax
+      - gate-config-pyflakes
     post:
       - ci-docs