diff --git a/jenkins/jobs/neutron-vpnaas.yaml b/jenkins/jobs/neutron-vpnaas.yaml
index 005ed9556f..66232946f7 100644
--- a/jenkins/jobs/neutron-vpnaas.yaml
+++ b/jenkins/jobs/neutron-vpnaas.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-neutron-vpnaas-dsvm-{vpnaastest}{job-suffix}'
+    name: '{pipeline}-neutron-vpnaas-dsvm-{vpnaastest}-{node}{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -45,7 +45,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-neutron-vpnaas-dsvm-rally{job-suffix}'
+    name: '{pipeline}-neutron-vpnaas-dsvm-rally-{node}{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -89,7 +89,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-neutron-dsvm-tempest-vpnaas{job-suffix}'
+    name: '{pipeline}-neutron-dsvm-tempest-vpnaas-{node}{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -122,7 +122,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-neutron-vpnaas-dsvm-api{which}{job-suffix}'
+    name: '{pipeline}-neutron-vpnaas-dsvm-api{which}-{node}{job-suffix}'
     node: '{node}'
 
     wrappers:
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 53258167d2..8c0b555251 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -8448,31 +8448,35 @@
       - 'gate-{name}-releasenotes'
       - 'gate-{name}-python35{suffix}':
           suffix: ''
-      - '{pipeline}-neutron-vpnaas-dsvm-{vpnaastest}{job-suffix}':
+      - '{pipeline}-neutron-vpnaas-dsvm-{vpnaastest}-{node}{job-suffix}':
           pipeline: gate
-          node: ubuntu-trusty
-          vpnaastest: functional
+          node:
+            - ubuntu-trusty
+            - ubuntu-xenial
+          vpnaastest:
+            - functional
+            - functional-sswan
           job-suffix: ''
           branch-override: default
-      - '{pipeline}-neutron-vpnaas-dsvm-{vpnaastest}{job-suffix}':
+      - '{pipeline}-neutron-vpnaas-dsvm-rally-{node}{job-suffix}':
           pipeline: gate
-          node: ubuntu-trusty
-          vpnaastest: functional-sswan
+          node:
+            - ubuntu-trusty
+            - ubuntu-xenial
           job-suffix: ''
           branch-override: default
-      - '{pipeline}-neutron-vpnaas-dsvm-rally{job-suffix}':
+      - '{pipeline}-neutron-dsvm-tempest-vpnaas-{node}{job-suffix}':
           pipeline: gate
-          node: ubuntu-trusty
+          node:
+            - ubuntu-trusty
+            - ubuntu-xenial
           job-suffix: ''
           branch-override: default
-      - '{pipeline}-neutron-dsvm-tempest-vpnaas{job-suffix}':
+      - '{pipeline}-neutron-vpnaas-dsvm-api{which}-{node}{job-suffix}':
           pipeline: gate
-          node: ubuntu-trusty
-          job-suffix: ''
-          branch-override: default
-      - '{pipeline}-neutron-vpnaas-dsvm-api{which}{job-suffix}':
-          pipeline: gate
-          node: ubuntu-trusty
+          node:
+            - ubuntu-trusty
+            - ubuntu-xenial
           job-suffix: '-nv'
           branch-override: default
           which: ''
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 1754019236..2c15326bd7 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2002,8 +2002,8 @@ jobs:
   - name: gate-novaclient-dsvm-functional-ubuntu-xenial
     branch: ^stable/newton$
 
-  - name: gate-neutron-dsvm-tempest-vpnaas
-    branch: ^(?!stable/liberty).*$
+  - name: gate-neutron-dsvm-tempest-vpnaas-ubuntu-trusty
+    branch: ^stable/mitaka$
 
   - name: gate-python-magnumclient-python34
     branch: ^(?!stable/liberty).*$
@@ -12224,8 +12224,10 @@ projects:
       - gate-tempest-dsvm-neutron-scenario-linuxbridge-ubuntu-xenial
       - gate-tempest-dsvm-neutron-dvr-multinode-scenario-ubuntu-xenial-nv
       - gate-grenade-dsvm-neutron-forward
-      - gate-neutron-vpnaas-dsvm-functional
-      - gate-neutron-vpnaas-dsvm-functional-sswan
+      - gate-neutron-vpnaas-dsvm-functional-ubuntu-trusty
+      - gate-neutron-vpnaas-dsvm-functional-ubuntu-xenial
+      - gate-neutron-vpnaas-dsvm-functional-sswan-ubuntu-trusty
+      - gate-neutron-vpnaas-dsvm-functional-sswan-ubuntu-xenial
       - gate-tempest-dsvm-neutron-full-ssh
       - gate-tempest-dsvm-neutron-ipv6only
       - gate-tempest-dsvm-neutron-serviceipv6
@@ -12405,16 +12407,23 @@ projects:
       - name: python35-jobs
     check:
       - gate-neutron-vpnaas-releasenotes
-      - gate-neutron-vpnaas-dsvm-functional
-      - gate-neutron-vpnaas-dsvm-functional-sswan
-      - gate-neutron-vpnaas-dsvm-api-nv
+      - gate-neutron-vpnaas-dsvm-functional-ubuntu-trusty
+      - gate-neutron-vpnaas-dsvm-functional-ubuntu-xenial
+      - gate-neutron-vpnaas-dsvm-functional-sswan-ubuntu-trusty
+      - gate-neutron-vpnaas-dsvm-functional-sswan-ubuntu-xenial
+      - gate-neutron-vpnaas-dsvm-api-ubuntu-trusty-nv
+      - gate-neutron-vpnaas-dsvm-api-ubuntu-xenial-nv
     gate:
       - gate-neutron-vpnaas-releasenotes
-      - gate-neutron-vpnaas-dsvm-functional
-      - gate-neutron-vpnaas-dsvm-functional-sswan
+      - gate-neutron-vpnaas-dsvm-functional-ubuntu-trusty
+      - gate-neutron-vpnaas-dsvm-functional-ubuntu-xenial
+      - gate-neutron-vpnaas-dsvm-functional-sswan-ubuntu-trusty
+      - gate-neutron-vpnaas-dsvm-functional-sswan-ubuntu-xenial
     experimental:
-      - gate-neutron-vpnaas-dsvm-rally
-      - gate-neutron-dsvm-tempest-vpnaas
+      - gate-neutron-vpnaas-dsvm-rally-ubuntu-trusty
+      - gate-neutron-vpnaas-dsvm-rally-ubuntu-xenial
+      - gate-neutron-dsvm-tempest-vpnaas-ubuntu-trusty
+      - gate-neutron-dsvm-tempest-vpnaas-ubuntu-xenial
     post:
       - neutron-vpnaas-coverage-ubuntu-trusty
       - neutron-vpnaas-coverage-ubuntu-xenial