diff --git a/jenkins/jobs/chef-jobs.yaml b/jenkins/jobs/chef-jobs.yaml
index b17b78ab15..43e9192fd2 100644
--- a/jenkins/jobs/chef-jobs.yaml
+++ b/jenkins/jobs/chef-jobs.yaml
@@ -1,8 +1,8 @@
 # this job template requires a bootstrap.sh script (which installs chefdk and other dependencies)
 # and a Rakefile with the tests that should be executed in the cookbook
 - job-template:
-    name: gate-{name}-chef-rake
-    node: ubuntu-trusty
+    name: 'gate-{name}-chef-rake'
+    node: 'ubuntu-xenial'
 
     wrappers:
       - build-timeout:
@@ -25,7 +25,7 @@
 # and a Rakefile with the integration tests that should be executed
 # sudo privileges for jenkins are not revoked, since they are needed during the chef run executed for integration testing
 - job-template:
-    name: gate-{node}-{name}-chef-rake-integration-nv
+    name: gate-{name}-chef-rake-integration-{node}-nv
     node: '{node}'
 
     wrappers:
@@ -46,7 +46,7 @@
       - console-log
 
 - job-template:
-    name: periodic-{node}-{name}-chef-rake-integration
+    name: periodic-{name}-chef-rake-integration-{node}
     node: '{node}'
 
     wrappers:
@@ -71,7 +71,7 @@
     name: chef-test-jobs
     jobs:
       - gate-{name}-chef-rake
-      - gate-{node}-{name}-chef-rake-integration-nv:
+      - gate-{name}-chef-rake-integration-{node}-nv:
           node:
             - centos-7
             - ubuntu-trusty
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index ca75f407e3..c5c7e13c8f 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -5710,7 +5710,7 @@
 
     jobs:
       - chef-test-jobs
-      - periodic-{node}-{name}-chef-rake-integration:
+      - periodic-{name}-chef-rake-integration-{node}:
           node:
             - centos-7
             - ubuntu-trusty
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 75ae7124a0..a711db305e 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -767,9 +767,9 @@ project-templates:
   - name: chef-rake-jobs
     check:
       - 'gate-{name}-chef-rake'
-      - 'gate-centos-7-{name}-chef-rake-integration-nv'
-      - 'gate-ubuntu-trusty-{name}-chef-rake-integration-nv'
-      - 'gate-ubuntu-xenial-{name}-chef-rake-integration-nv'
+      - 'gate-{name}-chef-rake-integration-centos-7-nv'
+      - 'gate-{name}-chef-rake-integration-ubuntu-trusty-nv'
+      - 'gate-{name}-chef-rake-integration-ubuntu-xenial-nv'
     gate:
       - 'gate-{name}-chef-rake'
 
@@ -9969,9 +9969,9 @@ projects:
       - name: merge-check
       - name: chef-rake-jobs
     periodic:
-      - periodic-centos-7-openstack-chef-repo-chef-rake-integration
-      - periodic-ubuntu-trusty-openstack-chef-repo-chef-rake-integration
-      - periodic-ubuntu-xenial-openstack-chef-repo-chef-rake-integration
+      - periodic-openstack-chef-repo-chef-rake-integration-centos-7
+      - periodic-openstack-chef-repo-chef-rake-integration-ubuntu-trusty
+      - periodic-openstack-chef-repo-chef-rake-integration-ubuntu-xenial
 
   - name: openstack/openstack-chef-specs
     template: