diff --git a/grafana/networking-bgpvpn.yaml b/grafana/networking-bgpvpn.yaml
index 97eac6b48f..38ed6cfe79 100644
--- a/grafana/networking-bgpvpn.yaml
+++ b/grafana/networking-bgpvpn.yaml
@@ -28,14 +28,14 @@ dashboard:
         - title: Integrated Failure Rates (Check queue)
           span: 4
           targets:
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-networking-bgpvpn-bagpipe.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-networking-bgpvpn-bagpipe.{SUCCESS,FAILURE})),'24hours'), 'gate-tempest-dsvm-networking-bgpvpn-bagpipe')
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-networking-bgpvpn-dsvm-functional.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-networking-bgpvpn-dsvm-functional.{SUCCESS,FAILURE})),'24hours'), 'gate-networking-bgpvpn-dsvm-functional')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-networking-bgpvpn-bagpipe-ubuntu-xenial.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-networking-bgpvpn-bagpipe-ubuntu-xenial.{SUCCESS,FAILURE})),'24hours'), 'gate-tempest-dsvm-networking-bgpvpn-bagpipe-ubuntu-xenial')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-networking-bgpvpn-dsvm-functional-ubuntu-xenial.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-networking-bgpvpn-dsvm-functional-ubuntu-xenial.{SUCCESS,FAILURE})),'24hours'), 'gate-networking-bgpvpn-dsvm-functional-ubuntu-xenial')
           type: graph
         - title: Integrated Failure Rates (Gate queue)
           span: 4
           targets:
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-tempest-dsvm-networking-bgpvpn-bagpipe.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-tempest-dsvm-networking-bgpvpn-bagpipe.{SUCCESS,FAILURE})),'24hours'), 'gate-tempest-dsvm-networking-bgpvpn-bagpipe')
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-networking-bgpvpn-dsvm-functional.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-networking-bgpvpn-dsvm-functional.{SUCCESS,FAILURE})),'24hours'), 'gate-networking-bgpvpn-dsvm-functional')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-tempest-dsvm-networking-bgpvpn-bagpipe-ubuntu-xenial.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-tempest-dsvm-networking-bgpvpn-bagpipe-ubuntu-xenial.{SUCCESS,FAILURE})),'24hours'), 'gate-tempest-dsvm-networking-bgpvpn-bagpipe-ubuntu-xenial')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-networking-bgpvpn-dsvm-functional-ubuntu-xenial.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-networking-bgpvpn-dsvm-functional-ubuntu-xenial.{SUCCESS,FAILURE})),'24hours'), 'gate-networking-bgpvpn-dsvm-functional-ubuntu-xenial')
           type: graph
         - title: Periodic Job Failure Rates
           span: 4
diff --git a/jenkins/jobs/networking-bgpvpn.yaml b/jenkins/jobs/networking-bgpvpn.yaml
index 57ea93019b..a60daa6521 100644
--- a/jenkins/jobs/networking-bgpvpn.yaml
+++ b/jenkins/jobs/networking-bgpvpn.yaml
@@ -1,7 +1,7 @@
 # Inspiration largely taken from networking-ovn.yaml
 
 - job-template:
-    name: '{pipeline}-networking-bgpvpn-dsvm-{bgpvpntest}{job-suffix}'
+    name: '{pipeline}-networking-bgpvpn-dsvm-{bgpvpntest}-{node}{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -60,7 +60,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-networking-bgpvpn-bagpipe-dsvm-{bgpvpntest}{job-suffix}'
+    name: '{pipeline}-networking-bgpvpn-bagpipe-dsvm-{bgpvpntest}-{node}{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -118,7 +118,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-networking-bgpvpn-bagpipe{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-networking-bgpvpn-bagpipe-{node}{job-suffix}'
     node: '{node}'
 
     wrappers:
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 13292d3845..18901a925b 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -7277,33 +7277,43 @@
       - periodic-python-jobs-with-neutron-lib-master
       - 'gate-{name}-python35-db{suffix}':
           suffix: ''
-      - '{pipeline}-networking-bgpvpn-dsvm-{bgpvpntest}{job-suffix}':
+      - '{pipeline}-networking-bgpvpn-dsvm-{bgpvpntest}-{node}{job-suffix}':
           pipeline: gate
           bgpvpntest: install
-          node: ubuntu-xenial
+          node:
+            - ubuntu-trusty
+            - ubuntu-xenial
           job-suffix: ''
           branch-override: default
-      - '{pipeline}-networking-bgpvpn-bagpipe-dsvm-{bgpvpntest}{job-suffix}':
+      - '{pipeline}-networking-bgpvpn-bagpipe-dsvm-{bgpvpntest}-{node}{job-suffix}':
           pipeline: gate
           bgpvpntest: install
-          node: ubuntu-xenial
+          node:
+            - ubuntu-trusty
+            - ubuntu-xenial
           job-suffix: ''
           branch-override: default
-      - '{pipeline}-networking-bgpvpn-dsvm-{bgpvpntest}{job-suffix}':
+      - '{pipeline}-networking-bgpvpn-dsvm-{bgpvpntest}-{node}{job-suffix}':
           pipeline: gate
           bgpvpntest: functional
-          node: ubuntu-xenial
+          node:
+            - ubuntu-trusty
+            - ubuntu-xenial
           job-suffix: ''
           branch-override: default
-      - '{pipeline}-networking-bgpvpn-bagpipe-dsvm-{bgpvpntest}{job-suffix}':
+      - '{pipeline}-networking-bgpvpn-bagpipe-dsvm-{bgpvpntest}-{node}{job-suffix}':
           pipeline: gate
           bgpvpntest: functional
-          node: ubuntu-xenial
+          node:
+            - ubuntu-trusty
+            - ubuntu-xenial
           job-suffix: ''
           branch-override: default
-      - '{pipeline}-tempest-dsvm-networking-bgpvpn-bagpipe{job-suffix}':
+      - '{pipeline}-tempest-dsvm-networking-bgpvpn-bagpipe-{node}{job-suffix}':
           pipeline: gate
-          node: ubuntu-xenial
+          node:
+            - ubuntu-trusty
+            - ubuntu-xenial
           job-suffix: ''
           branch-override: default
 
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index c81c4fdc4a..4317209072 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -11781,11 +11781,13 @@ projects:
     check:
       - networking-bagpipe-coverage-db-ubuntu-xenial
       - gate-tempest-dsvm-networking-bagpipe
-      - gate-tempest-dsvm-networking-bgpvpn-bagpipe
+      - gate-tempest-dsvm-networking-bgpvpn-bagpipe-ubuntu-trusty
+      - gate-tempest-dsvm-networking-bgpvpn-bagpipe-ubuntu-xenial
     gate:
       - networking-bagpipe-coverage-db-ubuntu-xenial
       - gate-tempest-dsvm-networking-bagpipe
-      - gate-tempest-dsvm-networking-bgpvpn-bagpipe
+      - gate-tempest-dsvm-networking-bgpvpn-bagpipe-ubuntu-trusty
+      - gate-tempest-dsvm-networking-bgpvpn-bagpipe-ubuntu-xenial
 
   - name: openstack/networking-bgpvpn
     template:
@@ -11801,17 +11803,21 @@ projects:
       - name: check-requirements
       - name: periodic-jobs-with-neutron-lib-master
     check:
-      - gate-tempest-dsvm-networking-bgpvpn-bagpipe
+      - gate-tempest-dsvm-networking-bgpvpn-bagpipe-ubuntu-trusty
+      - gate-tempest-dsvm-networking-bgpvpn-bagpipe-ubuntu-xenial
       - networking-bgpvpn-coverage-db-ubuntu-xenial
-      - gate-networking-bgpvpn-dsvm-functional
+      - gate-networking-bgpvpn-dsvm-functional-ubuntu-trusty
+      - gate-networking-bgpvpn-dsvm-functional-ubuntu-xenial
     gate:
-      - gate-tempest-dsvm-networking-bgpvpn-bagpipe
+      - gate-tempest-dsvm-networking-bgpvpn-bagpipe-ubuntu-trusty
+      - gate-tempest-dsvm-networking-bgpvpn-bagpipe-ubuntu-xenial
       - networking-bgpvpn-coverage-db-ubuntu-xenial
-      - gate-networking-bgpvpn-dsvm-functional
+      - gate-networking-bgpvpn-dsvm-functional-ubuntu-trusty
+      - gate-networking-bgpvpn-dsvm-functional-ubuntu-xenial
     experimental:
-      - gate-networking-bgpvpn-dsvm-install
-      - gate-networking-bgpvpn-bagpipe-dsvm-install
-      - gate-networking-bgpvpn-bagpipe-dsvm-functional
+      - gate-networking-bgpvpn-dsvm-install-ubuntu-xenial
+      - gate-networking-bgpvpn-bagpipe-dsvm-install-ubuntu-xenial
+      - gate-networking-bgpvpn-bagpipe-dsvm-functional-ubuntu-xenial
 
   - name: openstack/networking-bigswitch
     template: