diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index a5e148caa6..b470f26231 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -1079,45 +1079,45 @@
       # Stable gate jobs for branchless tempest
       - devstack-stable-jobs:
           pipeline: gate
-          node: devstack-trusty
+          node: ubuntu-trusty
           job-suffix: '-kilo'
           branch-override: stable/kilo
       - devstack-stable-jobs:
           pipeline: gate
-          node: devstack-trusty
+          node: ubuntu-trusty
           job-suffix: '-liberty'
           branch-override: stable/liberty
       # Stable check jobs for testing devstack gate
       # tempest also uses these job definitions
       - devstack-stable-jobs:
           pipeline: gate
-          node: devstack-trusty
+          node: ubuntu-trusty
           job-suffix: '-kilo-nv'
           branch-override: stable/kilo
       - devstack-stable-jobs:
           pipeline: gate
-          node: devstack-trusty
+          node: ubuntu-trusty
           job-suffix: '-liberty-nv'
           branch-override: stable/liberty
       # Periodic jobs for various branches
       - devstack-stable-jobs:
           pipeline: periodic
-          node: devstack-trusty
+          node: ubuntu-trusty
           job-suffix: '-kilo'
           branch-override: stable/kilo
       - devstack-stable-jobs:
           pipeline: periodic
-          node: devstack-trusty
+          node: ubuntu-trusty
           job-suffix: '-liberty'
           branch-override: stable/liberty
       - devstack-periodic-master-jobs:
           pipeline: periodic
-          node: devstack-trusty
+          node: ubuntu-trusty
           job-suffix: '-master'
           branch-override: master
       # Special jobs for devstack-gate
       - devstack-gate-jobs:
-          node: devstack-trusty
+          node: ubuntu-trusty
       - '{pipeline}-grenade-dsvm-multinode{job-suffix}':
           pipeline: gate
           node: devstack-trusty-2-node
@@ -1140,22 +1140,22 @@
           branch-override: default
       - '{pipeline}-tempest-dsvm-multinode-full{job-suffix}':
           pipeline: gate
-          node: devstack-trusty-2-node
+          node: ubuntu-trusty-2-node
           job-suffix: ''
           branch-override: default
       - '{pipeline}-tempest-dsvm-neutron-multinode-full{job-suffix}':
           pipeline: gate
-          node: devstack-trusty-2-node
+          node: ubuntu-trusty-2-node
           job-suffix: ''
           branch-override: default
       - '{pipeline}-tempest-dsvm-neutron-dvr-multinode-full{job-suffix}':
           pipeline: gate
-          node: devstack-trusty-2-node
+          node: ubuntu-trusty-2-node
           job-suffix: ''
           branch-override: default
       - '{pipeline}-tempest-dsvm-multinode-live-migration{job-suffix}':
           pipeline: gate
-          node: devstack-trusty-2-node
+          node: ubuntu-trusty-2-node
           job-suffix: ''
           branch-override: default
       # Experimental jobs for testing dib images.
@@ -1201,7 +1201,7 @@
           neutron: 1
           job-suffix: ''
 
-          
+
 - project:
     name: devstack-plugin-amqp1