diff --git a/modules/openstack_project/files/jenkins_job_builder/config/chef-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/chef-jobs.yaml
index 6c4e860384..b17fd7294b 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/chef-jobs.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/chef-jobs.yaml
@@ -4,8 +4,9 @@
 
     builders:
       - gerrit-git-prep
-      - chef-cookbook-prep
-      - chef-cookbook-rspec
+      - chef-bundler-prep
+      - chef-berkshelf-prep
+      - chef-cookbook-chefspec
 
     publishers:
       - console-log
@@ -16,8 +17,8 @@
 
     builders:
       - gerrit-git-prep
-      - chef-cookbook-prep
-      - chef-cookbook-lint
+      - chef-bundler-prep
+      - chef-cookbook-foodcritic
 
     publishers:
       - console-log
@@ -28,8 +29,8 @@
 
     builders:
       - gerrit-git-prep
-      - chef-cookbook-prep
-      - chef-cookbook-style
+      - chef-bundler-prep
+      - chef-cookbook-rubocop
 
     publishers:
       - console-log
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 e2111cd7d5..66f9820637 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
@@ -88,11 +88,17 @@
           done
 
 - builder:
-    name: chef-cookbook-prep
+    name: chef-bundler-prep
     builders:
       - shell: |
-          mkdir -p .cookbooks .bundle
+          mkdir -p .bundle
           ruby1.9.1 /usr/bin/bundle install --path=.bundle
+
+- builder:
+    name: chef-berkshelf-prep
+    builders:
+      - shell: |
+          mkdir -p .cookbooks
           ruby1.9.1 /usr/bin/bundle exec berks install --path=.cookbooks
           COOKBOOK=$(awk '/^name/ {print $NF}' metadata.rb |tr -d \"\')
           if [ -z $COOKBOOK ]; then
@@ -101,21 +107,20 @@
           fi
 
 - builder:
-    name: chef-cookbook-style
+    name: chef-cookbook-rubocop
     builders:
       - shell: |
           COOKBOOK=$(awk '/^name/ {print $NF}' metadata.rb |tr -d \"\')
-          ruby1.9.1 /usr/bin/bundle exec tailor
+          ruby1.9.1 /usr/bin/bundle exec rubocop
 
 - builder:
-    name: chef-cookbook-lint
+    name: chef-cookbook-foodcritic
     builders:
       - shell: |
-          COOKBOOK=$(awk '/^name/ {print $NF}' metadata.rb |tr -d \"\')
-          ruby1.9.1 /usr/bin/bundle exec foodcritic -f any -t ~FC003 -t ~FC023 .cookbooks/$COOKBOOK
+          ruby1.9.1 /usr/bin/bundle exec foodcritic -f any -t ~FC003 -t ~FC023 .
 
 - builder:
-    name: chef-cookbook-rspec
+    name: chef-cookbook-chefspec
     builders:
       - shell: |
           COOKBOOK=$(awk '/^name/ {print $NF}' metadata.rb |tr -d \"\')
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 c6906756b0..3ce62189c4 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -1473,6 +1473,7 @@
 
     jobs:
       - gate-{name}-chef-lint
+      - gate-{name}-chef-style
       - gate-{name}-chef-unit
 
 - project:
@@ -1492,6 +1493,7 @@
 
     jobs:
       - gate-{name}-chef-lint
+      - gate-{name}-chef-style
       - gate-{name}-chef-unit
 
 - project:
@@ -1501,6 +1503,7 @@
 
     jobs:
       - gate-{name}-chef-lint
+      - gate-{name}-chef-style
       - gate-{name}-chef-unit
 
 - project:
@@ -1510,6 +1513,7 @@
 
     jobs:
       - gate-{name}-chef-lint
+      - gate-{name}-chef-style
       - gate-{name}-chef-unit
 
 - project:
@@ -1519,6 +1523,7 @@
 
     jobs:
       - gate-{name}-chef-lint
+      - gate-{name}-chef-style
       - gate-{name}-chef-unit
 
 - project:
@@ -1528,6 +1533,7 @@
 
     jobs:
       - gate-{name}-chef-lint
+      - gate-{name}-chef-style
       - gate-{name}-chef-unit
 
 - project:
@@ -1537,6 +1543,7 @@
 
     jobs:
       - gate-{name}-chef-lint
+      - gate-{name}-chef-style
       - gate-{name}-chef-unit
 
 - project:
@@ -1546,6 +1553,7 @@
 
     jobs:
       - gate-{name}-chef-lint
+      - gate-{name}-chef-style
       - gate-{name}-chef-unit
 
 - project:
@@ -1555,6 +1563,7 @@
 
     jobs:
       - gate-{name}-chef-lint
+      - gate-{name}-chef-style
       - gate-{name}-chef-unit
 
 - project:
@@ -1564,6 +1573,7 @@
 
     jobs:
       - gate-{name}-chef-lint
+      - gate-{name}-chef-style
       - gate-{name}-chef-unit
 
 - project:
@@ -1573,6 +1583,7 @@
 
     jobs:
       - gate-{name}-chef-lint
+      - gate-{name}-chef-style
       - gate-{name}-chef-unit
 
 - project:
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 0dab9fa575..bd7abdddd4 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -2895,6 +2895,7 @@ projects:
   - name: stackforge/cookbook-openstack-block-storage
     check:
       - gate-cookbook-openstack-block-storage-chef-lint
+      - gate-cookbook-openstack-block-storage-chef-style
       - gate-cookbook-openstack-block-storage-chef-unit
     gate:
       - gate-cookbook-openstack-block-storage-chef-lint
@@ -2903,6 +2904,7 @@ projects:
   - name: stackforge/cookbook-openstack-common
     check:
       - gate-cookbook-openstack-common-chef-lint
+      - gate-cookbook-openstack-common-chef-style
       - gate-cookbook-openstack-common-chef-unit
     gate:
       - gate-cookbook-openstack-common-chef-lint
@@ -2911,6 +2913,7 @@ projects:
   - name: stackforge/cookbook-openstack-compute
     check:
       - gate-cookbook-openstack-compute-chef-lint
+      - gate-cookbook-openstack-compute-chef-style
       - gate-cookbook-openstack-compute-chef-unit
     gate:
       - gate-cookbook-openstack-compute-chef-lint
@@ -2919,6 +2922,7 @@ projects:
   - name: stackforge/cookbook-openstack-dashboard
     check:
       - gate-cookbook-openstack-dashboard-chef-lint
+      - gate-cookbook-openstack-dashboard-chef-style
       - gate-cookbook-openstack-dashboard-chef-unit
     gate:
       - gate-cookbook-openstack-dashboard-chef-lint
@@ -2927,6 +2931,7 @@ projects:
   - name: stackforge/cookbook-openstack-identity
     check:
       - gate-cookbook-openstack-identity-chef-lint
+      - gate-cookbook-openstack-identity-chef-style
       - gate-cookbook-openstack-identity-chef-unit
     gate:
       - gate-cookbook-openstack-identity-chef-lint
@@ -2935,6 +2940,7 @@ projects:
   - name: stackforge/cookbook-openstack-image
     check:
       - gate-cookbook-openstack-image-chef-lint
+      - gate-cookbook-openstack-image-chef-style
       - gate-cookbook-openstack-image-chef-unit
     gate:
       - gate-cookbook-openstack-image-chef-lint
@@ -2943,6 +2949,7 @@ projects:
   - name: stackforge/cookbook-openstack-metering
     check:
       - gate-cookbook-openstack-metering-chef-lint
+      - gate-cookbook-openstack-metering-chef-style
       - gate-cookbook-openstack-metering-chef-unit
     gate:
       - gate-cookbook-openstack-metering-chef-lint
@@ -2951,6 +2958,7 @@ projects:
   - name: stackforge/cookbook-openstack-network
     check:
       - gate-cookbook-openstack-network-chef-lint
+      - gate-cookbook-openstack-network-chef-style
       - gate-cookbook-openstack-network-chef-unit
     gate:
       - gate-cookbook-openstack-network-chef-lint
@@ -2959,6 +2967,7 @@ projects:
   - name: stackforge/cookbook-openstack-object-storage
     check:
       - gate-cookbook-openstack-object-storage-chef-lint
+      - gate-cookbook-openstack-object-storage-chef-style
       - gate-cookbook-openstack-object-storage-chef-unit
     gate:
       - gate-cookbook-openstack-object-storage-chef-lint
@@ -2967,6 +2976,7 @@ projects:
   - name: stackforge/cookbook-openstack-ops-database
     check:
       - gate-cookbook-openstack-ops-database-chef-lint
+      - gate-cookbook-openstack-ops-database-chef-style
       - gate-cookbook-openstack-ops-database-chef-unit
     gate:
       - gate-cookbook-openstack-ops-database-chef-lint
@@ -2975,6 +2985,7 @@ projects:
   - name: stackforge/cookbook-openstack-ops-messaging
     check:
       - gate-cookbook-openstack-ops-messaging-chef-lint
+      - gate-cookbook-openstack-ops-messaging-chef-style
       - gate-cookbook-openstack-ops-messaging-chef-unit
     gate:
       - gate-cookbook-openstack-ops-messaging-chef-lint
@@ -2983,6 +2994,7 @@ projects:
   - name: stackforge/cookbook-openstack-orchestration
     check:
       - gate-cookbook-openstack-orchestration-chef-lint
+      - gate-cookbook-openstack-orchestration-chef-style
       - gate-cookbook-openstack-orchestration-chef-unit
     gate:
       - gate-cookbook-openstack-orchestration-chef-lint