diff --git a/jenkins/jobs/nova-docker.yaml b/jenkins/jobs/nova-docker.yaml
index e2c2acd86f..d1b12f79dc 100644
--- a/jenkins/jobs/nova-docker.yaml
+++ b/jenkins/jobs/nova-docker.yaml
@@ -1,6 +1,6 @@
-- job:
-    name: gate-tempest-dsvm-docker
-    node: ubuntu-trusty
+- job-template:
+    name: 'gate-tempest-dsvm-docker-{node}-nv'
+    node: '{node}'
 
     wrappers:
       - build-timeout:
@@ -13,25 +13,25 @@
       - devstack-checkout
       - shell: |
           #!/bin/bash -xe
-          function gate_hook {
+          function gate_hook {{
               $BASE/new/nova-docker/contrib/devstack/gate_hook.sh
-          }
+          }}
 
           export -f gate_hook
 
-          function pre_test_hook {
+          function pre_test_hook {{
               if [ -f $BASE/new/nova-docker/contrib/devstack/pre_test_hook.sh ] ; then
                   $BASE/new/nova-docker/contrib/devstack/pre_test_hook.sh
               fi
-          }
+          }}
 
           export -f pre_test_hook
 
-          function post_test_hook {
+          function post_test_hook {{
               if [ -f $BASE/new/nova-docker/contrib/devstack/post_test_hook.sh ] ; then
                   $BASE/new/nova-docker/contrib/devstack/post_test_hook.sh
               fi
-          }
+          }}
 
           export -f post_test_hook
 
@@ -46,7 +46,7 @@
       - console-log
 
 - job:
-    name: gate-tempest-dsvm-docker-centos7
+    name: gate-tempest-dsvm-docker-centos7-nv
     node: centos-7
 
     wrappers:
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 6963da1f2e..dedb21d3cd 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -8593,6 +8593,10 @@
 
     jobs:
       - python-jobs
+      - 'gate-tempest-dsvm-docker-{node}-nv':
+          node:
+            - ubuntu-trusty
+            - ubuntu-xenial
 
 - project:
     name: nova-dpm
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 2c15326bd7..915929e415 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2852,12 +2852,6 @@ jobs:
   - name: gate-blazar-pylint
     voting: false
 
-  - name: gate-tempest-dsvm-docker
-    voting: false
-
-  - name: gate-tempest-dsvm-docker-centos7
-    voting: false
-
   - name: gate-neutron-dsvm-api-ubuntu-trusty
     branch: ^(stable/(liberty|mitaka))$
 
@@ -12546,8 +12540,9 @@ projects:
       - name: python-jobs
       - name: check-requirements
     check:
-      - gate-tempest-dsvm-docker
-      - gate-tempest-dsvm-docker-centos7
+      - gate-tempest-dsvm-docker-ubuntu-trusty-nv
+      - gate-tempest-dsvm-docker-ubuntu-xenial-nv
+      - gate-tempest-dsvm-docker-centos7-nv
 
   - name: openstack/nova-dpm
     template: