diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index f8dbc1653a..b46e3f1e7f 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -13832,9 +13832,7 @@
           service: data-processing
       - '{pipeline}-grenade-dsvm-sahara-{node}{suffix}':
           pipeline: gate
-          node:
-            - ubuntu-trusty
-            - ubuntu-xenial
+          node: ubuntu-xenial
           suffix: '-nv'
           branch-override: default
       - 'gate-{name}-buildimages-{plugin}-{node}{suffix}':
diff --git a/jenkins/jobs/sahara.yaml b/jenkins/jobs/sahara.yaml
index f61dcb718e..6c25f2db24 100644
--- a/jenkins/jobs/sahara.yaml
+++ b/jenkins/jobs/sahara.yaml
@@ -312,10 +312,9 @@
           export PROJECTS="openstack-dev/grenade $PROJECTS"
           export PROJECTS="openstack/sahara $PROJECTS"
           export PYTHONUNBUFFERED=true
-          OVERRIDE_ENABLED_SERVICES=c-api,c-bak,c-sch,c-vol,cinder,dstat,g-api,g-reg,key,mysql,n-api,n-cond,n-cpu,n-crt,n-sch,q-agt,q-dhcp,q-l3,q-meta,q-metering,q-svc,rabbit,s-account,s-container,s-object,s-proxy,ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api,sahara,h-api,h-api-cfn,h-api-cw,h-eng,heat
           export GRENADE_PLUGINRC="enable_grenade_plugin sahara https://git.openstack.org/openstack/sahara"
           export GRENADE_PLUGINRC+=$'\n'"enable_grenade_plugin heat https://git.openstack.org/openstack/heat"
-          export OVERRIDE_ENABLED_SERVICES
+
           export DEVSTACK_GATE_NEUTRON=1
           export DEVSTACK_GATE_TEMPEST=0
           export DEVSTACK_GATE_TEMPEST_NOTESTS=1
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index dc37f1bbc5..0dee78ff98 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -17272,7 +17272,6 @@ projects:
       - gate-tempest-dsvm-sahara-ubuntu-xenial
       - sahara-coverage-ubuntu-trusty-nv
       - sahara-coverage-ubuntu-xenial-nv
-      - gate-grenade-dsvm-sahara-ubuntu-trusty-nv
       - gate-grenade-dsvm-sahara-ubuntu-xenial-nv
       - gate-sahara-dsvm-scenario-neutron-ubuntu-xenial
       - gate-sahara-dsvm-scenario-neutron-ubuntu-trusty-nv