diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 5e02b81ffc..bb032aa1f7 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -15044,6 +15044,14 @@
 
     jobs:
       - python-jobs
+      - 'training-labs-scripts-{node}':
+          node:
+            - ubuntu-trusty
+            - ubuntu-xenial
+      - 'gate-training-labs-scripts-{node}':
+          node:
+            - ubuntu-trusty
+            - ubuntu-xenial
 
 - project:
     name: transparency-policy
diff --git a/jenkins/jobs/training-labs.yaml b/jenkins/jobs/training-labs.yaml
index e301273cc0..cbb5b925c7 100644
--- a/jenkins/jobs/training-labs.yaml
+++ b/jenkins/jobs/training-labs.yaml
@@ -1,6 +1,6 @@
-- job:
-    name: 'training-labs-scripts'
-    node: ubuntu-trusty
+- job-template:
+    name: 'training-labs-scripts-{node}'
+    node: '{node}'
 
     builders:
       - gerrit-git-prep
@@ -20,9 +20,9 @@
               copy-after-failure: false
       - console-log
 
-- job:
-    name: 'gate-training-labs-scripts'
-    node: ubuntu-trusty
+- job-template:
+    name: 'gate-training-labs-scripts-{node}'
+    node: '{node}'
 
     builders:
       - gerrit-git-prep
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 425f9d590c..cc57c3f9a1 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -17600,11 +17600,14 @@ projects:
       - name: merge-check
       - name: python-jobs
     check:
-      - gate-training-labs-scripts
+      - gate-training-labs-scripts-ubuntu-trusty
+      - gate-training-labs-scripts-ubuntu-xenial
     gate:
-      - gate-training-labs-scripts
+      - gate-training-labs-scripts-ubuntu-trusty
+      - gate-training-labs-scripts-ubuntu-xenial
     post:
-      - training-labs-scripts
+      - training-labs-scripts-ubuntu-trusty
+      - training-labs-scripts-ubuntu-xenial
 
   - name: openstack/transparency-policy
     template: