diff --git a/grafana/neutron.yaml b/grafana/neutron.yaml
index 7836a84db3..d8a2afaa16 100644
--- a/grafana/neutron.yaml
+++ b/grafana/neutron.yaml
@@ -57,14 +57,9 @@ dashboard:
           span: 4
           targets:
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-neutron-dsvm-api-ubuntu-xenial.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-neutron-dsvm-api-ubuntu-xenial.{SUCCESS,FAILURE})),'24hours'), 'gate-neutron-dsvm-api-ubuntu-xenial')
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-neutron-dsvm-functional-ubuntu-xenial.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-neutron-dsvm-functional-ubuntu-xenial.{SUCCESS,FAILURE})),'24hours'), 'gate-neutron-dsvm-functional-ubuntu-xenial')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-neutron-dsvm-functional-ubuntu-xenial-nv.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-neutron-dsvm-functional-ubuntu-xenial-nv.{SUCCESS,FAILURE})),'24hours'), 'gate-neutron-dsvm-functional-ubuntu-xenial-nv')
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-neutron-dsvm-fullstack-ubuntu-xenial.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-neutron-dsvm-fullstack-ubuntu-xenial.{SUCCESS,FAILURE})),'24hours'), 'gate-neutron-dsvm-fullstack-ubuntu-xenial')
           type: graph
-        - title: Functional Failure Rates (Gate queue)
-          span: 4
-          targets:
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-neutron-dsvm-functional-ubuntu-xenial.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-neutron-dsvm-functional-ubuntu-xenial.{SUCCESS,FAILURE})),'24hours'), 'gate-neutron-dsvm-functional-ubuntu-xenial')
-          type: graph
         - title: Coverage Failure Rates (Gate queue)
           span: 4
           targets:
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 6ba883d45c..ea3d6652c8 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -8045,12 +8045,6 @@
           node-release: ubuntu-xenial
           suffix: '-nv'
           branch-override: default
-      - '{pipeline}-neutron-dsvm-functional{python}-{node}{suffix}':
-          pipeline: gate
-          python: ''
-          node: ubuntu-xenial
-          suffix: ''
-          branch-override: default
       - '{pipeline}-neutron-dsvm-functional{python}-{node}{suffix}':
           pipeline: gate
           python: '-python35'
@@ -8063,7 +8057,8 @@
           node: ubuntu-xenial
           suffix: ''
           branch-override: master
-      # This job is for cross testing with devstack-gate
+      # This job is for cross testing with devstack-gate, and for neutron check
+      # queue while we are solving instability issues (bugs 1707933, 1709032)
       - '{pipeline}-neutron-dsvm-functional{python}-{node}{suffix}':
           pipeline: gate
           python: ''
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 9236ff60fe..b425bd32c5 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -12549,7 +12549,7 @@ projects:
     check:
       - neutron-coverage-ubuntu-xenial
       - gate-neutron-dsvm-api-ubuntu-xenial
-      - gate-neutron-dsvm-functional-ubuntu-xenial
+      - gate-neutron-dsvm-functional-ubuntu-xenial-nv
       - gate-neutron-dsvm-fullstack-ubuntu-xenial
       - gate-rally-dsvm-neutron-neutron-ubuntu-xenial
       - gate-tempest-dsvm-neutron-dvr-ubuntu-xenial
@@ -12567,7 +12567,6 @@ projects:
     gate:
       - neutron-coverage-ubuntu-xenial
       - gate-neutron-dsvm-api-ubuntu-xenial
-      - gate-neutron-dsvm-functional-ubuntu-xenial
       - gate-tempest-dsvm-neutron-dvr-ubuntu-xenial
       - gate-tempest-dsvm-neutron-linuxbridge-ubuntu-xenial
       - gate-grenade-dsvm-neutron-multinode-ubuntu-xenial