diff --git a/grafana/networking-odl.yaml b/grafana/networking-odl.yaml
index a777b4447e..9f22ba786f 100644
--- a/grafana/networking-odl.yaml
+++ b/grafana/networking-odl.yaml
@@ -36,7 +36,9 @@ dashboard:
           span: 4
           targets:
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-dsvm-networking-odl-functional-carbon-snapshot.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-dsvm-networking-odl-functional-carbon-snapshot.{SUCCESS,FAILURE})),'24hours'), 'gate-dsvm-networking-odl-functional-carbon-snapshot')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-dsvm-networking-odl-functional-nitrogen-snapshot-nv.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-dsvm-networking-odl-functional-nitrogen-snapshot-nv.{SUCCESS,FAILURE})),'24hours'), 'gate-dsvm-networking-odl-functional-nitrogen-snapshot-nv')
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-dsvm-networking-odl-fullstack-carbon-snapshot-nv.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-dsvm-networking-odl-fullstack-carbon-snapshot-nv.{SUCCESS,FAILURE})),'24hours'), 'gate-dsvm-networking-odl-fullstack-carbon-snapshot-nv')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-dsvm-networking-odl-fullstack-nitrogen-snapshot-nv.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-dsvm-networking-odl-fullstack-nitrogen-snapshot-nv.{SUCCESS,FAILURE})),'24hours'), 'gate-dsvm-networking-odl-fullstack-nitrogen-snapshot-nv')
           type: graph
         - title: Functional/Fullstack Tests Failure Rates (Gate queue)
           span: 4
@@ -46,28 +48,29 @@ dashboard:
         - title: Tempest Failure Rates (Check queue)
           span: 4
           targets:
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-networking-odl-beryllium-snapshot-v2driver.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-networking-odl-beryllium-snapshot-v1driver.{SUCCESS,FAILURE})),'24hours'), 'gate-tempest-dsvm-networking-odl-beryllium-snapshot-v2driver')
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-networking-odl-boron-snapshot-v2driver.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-networking-odl-boron-snapshot-v1driver.{SUCCESS,FAILURE})),'24hours'), 'gate-tempest-dsvm-networking-odl-boron-snapshot-v2driver')
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-networking-odl-carbon-snapshot-vpnservice-v1driver-nv.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-networking-odl-carbon-snapshot-vpnservice-v1driver.{SUCCESS,FAILURE})),'24hours'), 'gate-tempest-dsvm-networking-odl-carbon-snapshot-vpnservice-v1driver-nv')
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-networking-odl-carbon-snapshot-vpnservice-v2driver-nv.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-networking-odl-carbon-snapshot-vpnservice-v2driver.{SUCCESS,FAILURE})),'24hours'), 'gate-tempest-dsvm-networking-odl-carbon-snapshot-vpnservice-v2driver-nv')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-networking-odl-carbon-snapshot-vpnservice-v1driver-nv.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-networking-odl-carbon-snapshot-vpnservice-v1driver-nv.{SUCCESS,FAILURE})),'24hours'), 'gate-tempest-dsvm-networking-odl-carbon-snapshot-vpnservice-v1driver-nv')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-networking-odl-carbon-snapshot-vpnservice-v2driver-nv.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-networking-odl-carbon-snapshot-vpnservice-v2driver-nv.{SUCCESS,FAILURE})),'24hours'), 'gate-tempest-dsvm-networking-odl-carbon-snapshot-vpnservice-v2driver-nv')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-networking-odl-nitrogen-snapshot-vpnservice-v1driver-nv.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-networking-odl-nitrogen-snapshot-vpnservice-v1driver-nv.{SUCCESS,FAILURE})),'24hours'), 'gate-tempest-dsvm-networking-odl-nitrogen-snapshot-vpnservice-v1driver-nv')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-networking-odl-nitrogen-snapshot-vpnservice-v2driver-nv.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-networking-odl-nitrogen-snapshot-vpnservice-v2driver-nv.{SUCCESS,FAILURE})),'24hours'), 'gate-tempest-dsvm-networking-odl-nitrogen-snapshot-vpnservice-v2driver-nv')
           type: graph
         - title: Tempest Failure Rates (Gate queue)
           span: 4
           targets:
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-tempest-dsvm-networking-odl-beryllium-snapshot-v2driver.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-tempest-dsvm-networking-odl-beryllium-snapshot-v1driver.{SUCCESS,FAILURE})),'24hours'), 'gate-tempest-dsvm-networking-odl-beryllium-snapshot-v2driver')
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-tempest-dsvm-networking-odl-boron-snapshot-v2driver.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-tempest-dsvm-networking-odl-boron-snapshot-v1driver.{SUCCESS,FAILURE})),'24hours'), 'gate-tempest-dsvm-networking-odl-boron-snapshot-v2driver')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-tempest-dsvm-networking-odl-boron-snapshot-v2driver.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-tempest-dsvm-networking-odl-boron-snapshot-v2driver.{SUCCESS,FAILURE})),'24hours'), 'gate-tempest-dsvm-networking-odl-boron-snapshot-v2driver')
           type: graph
         - title: Multi-node Failure Rates (Check queue)
           span: 4
           targets:
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-networking-odl-multinode-carbon-snapshot-nv.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-networking-odl-multinode-carbon-snapshot-nv.{SUCCESS,FAILURE})),'24hours'), 'gate-tempest-dsvm-networking-odl-multinode-carbon-snapshot-nv')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-networking-odl-multinode-nitrogen-snapshot-nv.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-networking-odl-multinode-nitrogen-snapshot-nv.{SUCCESS,FAILURE})),'24hours'), 'gate-tempest-dsvm-networking-odl-multinode-nitrogen-snapshot-nv')
           type: graph
         - title: Rally Failure Rates (Check queue)
           span: 4
           targets:
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-rally-dsvm-networking-odl-beryllium-snapshot.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-rally-dsvm-networking-odl-beryllium-snapshot.{SUCCESS,FAILURE})),'24hours'), 'gate-rally-dsvm-networking-odl-beryllium-snapshot')
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-rally-dsvm-networking-odl-boron-snapshot.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-rally-dsvm-networking-odl-boron-snapshot.{SUCCESS,FAILURE})),'24hours'), 'gate-rally-dsvm-networking-odl-boron-snapshot')
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-rally-dsvm-networking-odl-carbon-snapshot.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-rally-dsvm-networking-odl-carbon-snapshot.{SUCCESS,FAILURE})),'24hours'), 'gate-rally-dsvm-networking-odl-carbon-snapshot')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-rally-dsvm-networking-odl-nitrogen-snapshot-nv.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-rally-dsvm-networking-odl-nitrogen-snapshot-nv.{SUCCESS,FAILURE})),'24hours'), 'gate-rally-dsvm-networking-odl-nitrogen-snapshot-nv')
           type: graph
         - title: Periodic jobs
           span: 4
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index a152c68926..3fbcaa637c 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -7871,7 +7871,6 @@
           odl-provider: ''
           driver-version: 'v1driver'
           odl-release-base:
-            - 'beryllium-snapshot'
             - 'boron-snapshot'
             - 'carbon-snapshot'
           branch-override: stable/mitaka
@@ -7892,7 +7891,6 @@
           odl-provider: ''
           driver-version: 'v2driver'
           odl-release-base:
-            - 'beryllium-snapshot'
             - 'boron-snapshot'
           branch-override: default
       - '{pipeline}-tempest-dsvm-networking-odl-{odl-release-base}-{odl-provider}{driver-version}{suffix}':
@@ -7906,21 +7904,26 @@
           odl-release-base:
             - 'boron-snapshot'
             - 'carbon-snapshot'
+            - 'nitrogen-snapshot'
           branch-override: default
       - '{pipeline}-tempest-dsvm-networking-odl-multinode-{odl-release-base}{suffix}':
           pipeline: gate
           node: ubuntu-xenial-2-node
           suffix: '-nv'
-          odl-release-base: 'carbon-snapshot'
+          odl-release-base:
+            - 'carbon-snapshot'
+            - 'nitrogen-snapshot'
           branch-override: default
       - '{pipeline}-rally-dsvm-networking-odl-{odl-release-base}{suffix}':
           pipeline: gate
           node: ubuntu-xenial
-          suffix: ''
+          suffix:
+            - ''
+            - '-nv'
           odl-release-base:
-            - 'beryllium-snapshot'
             - 'boron-snapshot'
             - 'carbon-snapshot'
+            - 'nitrogen-snapshot'
           branch-override: default
       - '{pipeline}-grenade-dsvm-networking-odl{suffix}':
           pipeline: gate
@@ -7931,15 +7934,21 @@
           pipeline: gate
           node: ubuntu-xenial
           odltest: fullstack
-          odl-release-base: 'carbon-snapshot'
+          odl-release-base:
+            - 'carbon-snapshot'
+            - 'nitrogen-snapshot'
           suffix: '-nv'
           branch-override: default
       - '{pipeline}-dsvm-networking-odl-{odltest}-{odl-release-base}{suffix}':
           pipeline: gate
           node: ubuntu-xenial
           odltest: functional
-          odl-release-base: 'carbon-snapshot'
-          suffix: ''
+          odl-release-base:
+            - 'carbon-snapshot'
+            - 'nitrogen-snapshot'
+          suffix:
+            - ''
+            - '-nv'
           branch-override: default
       - periodic-python-jobs-with-neutron-lib-master
 
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index cf24ef5062..bb051a47aa 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2505,15 +2505,24 @@ jobs:
   - name: ^gate-tempest-dsvm-networking-odl-.+-snapshot-v1driver-mitaka-nv$
     branch: ^stable/mitaka$
 
-  - name: ^gate-tempest-dsvm-networking-odl-.+-snapshot-v2driver(-nv)?$
+  - name: ^gate-tempest-dsvm-networking-odl-.+-snapshot-v2driver
     branch: ^(?!stable/(mitaka|newton)).*$
 
+  - name: ^gate-tempest-dsvm-networking-odl-nitrogen-snapshot-vpnservice-.+
+    branch: ^(?!stable/(newton|ocata)).*$
+
   - name: ^gate-dsvm-networking-odl-.+$
     branch: ^(?!stable/(mitaka|newton)).*$
 
+  - name: ^gate-rally-dsvm-networking-odl-nitrogen-snapshot
+    branch: ^(?!stable/(newton|ocata)).*$
+
   - name: ^gate-rally-dsvm-networking-odl-.+-snapshot
     branch: ^(?!stable/(mitaka|newton)).*$
 
+  - name: ^gate-dsvm-networking-odl-(fullstack|functional)-nitrogen-snapshot
+    branch: ^(?!stable/(newton|ocata)).*$
+
   - name: gate-dragonflow-python34
     voting: false
 
@@ -12759,23 +12768,25 @@ projects:
       - name: translation-jobs
     check:
       - gate-grenade-dsvm-networking-odl-nv
-      - gate-tempest-dsvm-networking-odl-beryllium-snapshot-v1driver-mitaka-nv
-      - gate-tempest-dsvm-networking-odl-beryllium-snapshot-v2driver
       - gate-tempest-dsvm-networking-odl-boron-snapshot-v1driver-mitaka-nv
       - gate-tempest-dsvm-networking-odl-boron-snapshot-v2driver
       - gate-tempest-dsvm-networking-odl-carbon-snapshot-v1driver-mitaka-nv
       - gate-tempest-dsvm-networking-odl-carbon-snapshot-vpnservice-v1driver-nv
       - gate-tempest-dsvm-networking-odl-carbon-snapshot-vpnservice-v2driver-nv
+      - gate-tempest-dsvm-networking-odl-nitrogen-snapshot-vpnservice-v1driver-nv
+      - gate-tempest-dsvm-networking-odl-nitrogen-snapshot-vpnservice-v2driver-nv
       - gate-tempest-dsvm-networking-odl-multinode-carbon-snapshot-nv
-      - gate-rally-dsvm-networking-odl-beryllium-snapshot
+      - gate-tempest-dsvm-networking-odl-multinode-nitrogen-snapshot-nv
       - gate-rally-dsvm-networking-odl-boron-snapshot
       - gate-rally-dsvm-networking-odl-carbon-snapshot
+      - gate-rally-dsvm-networking-odl-nitrogen-snapshot-nv
       - gate-dsvm-networking-odl-fullstack-carbon-snapshot-nv
       - gate-dsvm-networking-odl-functional-carbon-snapshot
+      - gate-dsvm-networking-odl-fullstack-nitrogen-snapshot-nv
+      - gate-dsvm-networking-odl-functional-nitrogen-snapshot-nv
       - networking-odl-coverage-ubuntu-trusty
       - networking-odl-coverage-ubuntu-xenial
     gate:
-      - gate-tempest-dsvm-networking-odl-beryllium-snapshot-v2driver
       - gate-tempest-dsvm-networking-odl-boron-snapshot-v2driver
       - gate-dsvm-networking-odl-functional-carbon-snapshot
       - networking-odl-coverage-ubuntu-trusty