diff --git a/jenkins/jobs/solum.yaml b/jenkins/jobs/solum.yaml
index 5a109f5ebf..16d7a32bcd 100644
--- a/jenkins/jobs/solum.yaml
+++ b/jenkins/jobs/solum.yaml
@@ -16,7 +16,7 @@
           export PYTHONUNBUFFERED=true
           export DEVSTACK_GATE_TIMEOUT=60
           export DEVSTACK_GATE_NEUTRON=1
-          export ENABLED_SERVICES=solum,solum-api,solum-build-api,solum-conductor,solum-deployer,solum-worker,tempest,zaqar,barbican,mistral
+          export ENABLED_SERVICES=solum,solum-api,solum-conductor,solum-deployer,solum-worker,tempest,zaqar,barbican,mistral
           export PROJECTS="stackforge/solum $PROJECTS"
           # TODO(ravips): Workaround until barbican, mistral gets into devstack
           export PROJECTS="openstack/barbican stackforge/mistral $PROJECTS"
@@ -47,8 +47,8 @@
       - console-log
 
 - job:
-    name: 'gate-solum-devstack-dsvm-f20'
-    node: 'devstack-f20'
+    name: 'gate-solum-devstack-dsvm-centos7'
+    node: 'devstack-centos7'
 
     wrappers:
       - build-timeout:
@@ -64,7 +64,7 @@
           export PYTHONUNBUFFERED=true
           export DEVSTACK_GATE_TIMEOUT=60
           export DEVSTACK_GATE_NEUTRON=1
-          export ENABLED_SERVICES=solum,solum-api,solum-build-api,solum-conductor,solum-deployer,solum-worker,tempest,zaqar,barbican,mistral
+          export ENABLED_SERVICES=solum,solum-api,solum-conductor,solum-deployer,solum-worker,tempest,zaqar,barbican,mistral
           export PROJECTS="stackforge/solum $PROJECTS"
           # TODO(ravips): Workaround until barbican, mistral gets into devstack
           export PROJECTS="openstack/barbican stackforge/mistral $PROJECTS"
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 70e73b0c3f..4c9c314830 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -869,7 +869,7 @@ jobs:
     voting: false
   - name: gate-solum-python34
     voting: false
-  - name: gate-solum-devstack-dsvm-f20
+  - name: gate-solum-devstack-dsvm-centos7
     voting: false
   - name: gate-reviewstats-python34
     voting: false
@@ -6480,7 +6480,7 @@ projects:
     check:
       - gate-solum-python34
       - gate-solum-devstack-dsvm
-      - gate-solum-devstack-dsvm-f20
+      - gate-solum-devstack-dsvm-centos7
     gate:
       - gate-solum-devstack-dsvm
     post: