diff --git a/modules/openstack_project/files/jenkins_job_builder/config/tripleo.yaml b/modules/openstack_project/files/jenkins_job_builder/config/tripleo.yaml
index c35bcf8467..6b8b29daf0 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/tripleo.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/tripleo.yaml
@@ -40,7 +40,7 @@
       - console-log
 
 - job:
-    name: 'check-tripleo-undercloud-precise'
+    name: 'check-tripleo-novabm-undercloud-precise'
     node: 'tripleo-precise'
 
     wrappers:
@@ -122,7 +122,7 @@
       - console-log
 
 - job:
-    name: 'check-tripleo-overcloud-precise'
+    name: 'check-tripleo-novabm-overcloud-precise'
     node: 'tripleo-precise'
 
     wrappers:
@@ -163,7 +163,7 @@
       - console-log
 
 - job:
-    name: 'check-tripleo-overcloud-f20'
+    name: 'check-tripleo-novabm-overcloud-f20'
     node: 'tripleo-f20'
 
     wrappers:
@@ -203,7 +203,7 @@
       - console-log
 
 - job:
-    name: 'check-tripleo-vlan-precise'
+    name: 'check-tripleo-ironic-vlan-precise'
     node: 'tripleo-precise'
 
     wrappers:
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 38d8916a3c..6b0b1e3b32 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -787,7 +787,7 @@ projects:
     experimental:
       - gate-grenade-dsvm-forward
     experimental-tripleo:
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
     pre-release:
       - cinder-tarball
     release:
@@ -885,9 +885,9 @@ projects:
       - gate-grenade-dsvm-forward
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
     pre-release:
       - glance-tarball
     release:
@@ -920,9 +920,9 @@ projects:
       - gate-grenade-dsvm-forward
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
     pre-release:
       - glance.store-tarball
     release:
@@ -942,9 +942,9 @@ projects:
       - gate-devstack-dsvm-cells
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
     pre-release:
       - heat-tarball
     release:
@@ -1037,9 +1037,9 @@ projects:
       - gate-grenade-dsvm-forward
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
     pre-release:
       - keystone-tarball
     release:
@@ -1111,9 +1111,9 @@ projects:
       - gate-grenade-dsvm-neutron-forward
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
     pre-release:
       - neutron-tarball
     release:
@@ -1155,9 +1155,9 @@ projects:
       - check-tempest-dsvm-nova-v3-full
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
     pre-release:
       - nova-tarball
     release:
@@ -1241,9 +1241,9 @@ projects:
       - gate-grenade-dsvm-forward
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
     pre-release:
       - swift-tarball
     release:
@@ -1288,11 +1288,11 @@ projects:
       - name: python-jobs
     check-tripleo:
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-undercloud-precise
-      - check-tripleo-overcloud-f20
+      - check-tripleo-novabm-undercloud-precise
+      - check-tripleo-novabm-overcloud-f20
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
     pre-release:
       - tuskar-tarball
     release:
@@ -1356,9 +1356,9 @@ projects:
       - gate-grenade-dsvm-forward
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
 
   - name: openstack/python-designateclient
     template:
@@ -1390,9 +1390,9 @@ projects:
       - gate-grenade-dsvm-forward
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
 
   - name: openstack/python-glanceclient
     template:
@@ -1417,9 +1417,9 @@ projects:
       - gate-grenade-dsvm-forward
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
 
 #TODO: add docs
   - name: openstack/python-heatclient
@@ -1447,9 +1447,9 @@ projects:
       - python-heatclient-coverage
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
     release:
       - python-heatclient-docs
 
@@ -1496,9 +1496,9 @@ projects:
       - gate-grenade-dsvm-forward
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
 
   - name: openstack/python-marconiclient
     template:
@@ -1536,9 +1536,9 @@ projects:
       - gate-grenade-dsvm-forward
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
 
   - name: openstack/python-novaclient
     template:
@@ -1564,9 +1564,9 @@ projects:
       - gate-grenade-dsvm-forward
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
 
   - name: openstack/python-openstackclient
     template:
@@ -1612,9 +1612,9 @@ projects:
       - gate-tempest-dsvm-neutron-large-ops
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
 
   - name: openstack/python-troveclient
     template:
@@ -1639,8 +1639,8 @@ projects:
       - gate-python-tuskarclient-python33
     check-tripleo:
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-undercloud-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-undercloud-precise
+      - check-tripleo-novabm-overcloud-precise
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
 
@@ -1657,9 +1657,9 @@ projects:
       - gate-diskimage-builder-python27
       - check-tempest-dsvm-virtual-ironic
     check-tripleo:
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-f20
+      - check-tripleo-novabm-overcloud-f20
     gate:
       - gate-diskimage-builder-pep8
       - gate-diskimage-builder-python26
@@ -1667,7 +1667,7 @@ projects:
       - gate-tempest-dsvm-virtual-ironic
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
     post:
       - diskimage-builder-coverage
       - diskimage-builder-branch-tarball
@@ -1679,13 +1679,13 @@ projects:
     check:
       - noop
     check-tripleo:
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-f20
+      - check-tripleo-novabm-overcloud-f20
     gate:
       - noop
     experimental-tripleo:
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
       - check-tripleo-ironic-seed-precise
     post:
       - dib-utils-branch-tarball
@@ -1801,16 +1801,16 @@ projects:
       - gate-os-apply-config-python26
       - gate-os-apply-config-python27
     check-tripleo:
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-f20
+      - check-tripleo-novabm-overcloud-f20
     gate:
       - gate-os-apply-config-pep8
       - gate-os-apply-config-python26
       - gate-os-apply-config-python27
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
     post:
       - os-apply-config-coverage
       - os-apply-config-branch-tarball
@@ -1824,16 +1824,16 @@ projects:
       - gate-os-cloud-config-python26
       - gate-os-cloud-config-python27
     check-tripleo:
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-f20
+      - check-tripleo-novabm-overcloud-f20
     gate:
       - gate-os-cloud-config-pep8
       - gate-os-cloud-config-python26
       - gate-os-cloud-config-python27
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
     post:
       - os-cloud-config-docs
       - os-cloud-config-coverage
@@ -1849,16 +1849,16 @@ projects:
       - gate-os-collect-config-python26
       - gate-os-collect-config-python27
     check-tripleo:
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-f20
+      - check-tripleo-novabm-overcloud-f20
     gate:
       - gate-os-collect-config-pep8
       - gate-os-collect-config-python26
       - gate-os-collect-config-python27
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
     post:
       - os-collect-config-coverage
       - os-collect-config-branch-tarball
@@ -1873,16 +1873,16 @@ projects:
       - gate-os-refresh-config-python26
       - gate-os-refresh-config-python27
     check-tripleo:
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-f20
+      - check-tripleo-novabm-overcloud-f20
     gate:
       - gate-os-refresh-config-pep8
       - gate-os-refresh-config-python26
       - gate-os-refresh-config-python27
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
     post:
       - os-refresh-config-coverage
       - os-refresh-config-branch-tarball
@@ -1948,9 +1948,9 @@ projects:
       - gate-devstack-dsvm-cells
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
 
   - name: openstack/oslo.db
     template:
@@ -1970,9 +1970,9 @@ projects:
       - gate-tempest-dsvm-neutron-large-ops
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
 
   - name: openstack/oslo.i18n
     template:
@@ -1991,9 +1991,9 @@ projects:
       - gate-devstack-dsvm-cells
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
 
   - name: openstack/oslo.messaging
     template:
@@ -2014,9 +2014,9 @@ projects:
       - gate-tempest-dsvm-neutron-large-ops
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
 
 #TODO: add docs
   - name: openstack/oslo.rootwrap
@@ -2044,9 +2044,9 @@ projects:
       - oslo.rootwrap-branch-tarball
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
 
   - name: openstack/oslo.utils
     template:
@@ -2077,9 +2077,9 @@ projects:
       - gate-devstack-dsvm-cells
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
 
   - name: openstack/oslo.vmware
     template:
@@ -2118,9 +2118,9 @@ projects:
       - propose-requirements-updates
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
 
 # TODO: add docs
   - name: openstack/sahara-dashboard
@@ -2265,9 +2265,9 @@ projects:
       - check-tempest-master-dsvm-neutron-havana
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
     post:
       - tempest-docs
       - tempest-coverage
@@ -2293,14 +2293,14 @@ projects:
     check:
       - noop
     check-tripleo:
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-f20
+      - check-tripleo-novabm-overcloud-f20
     gate:
       - noop
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
     post:
       - tripleo-heat-templates-branch-tarball
     pre-release:
@@ -2314,14 +2314,14 @@ projects:
     check:
       - noop
     check-tripleo:
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-f20
+      - check-tripleo-novabm-overcloud-f20
     gate:
       - noop
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
     post:
       - tripleo-image-elements-branch-tarball
 
@@ -2329,15 +2329,15 @@ projects:
     check:
       - gate-tripleo-incubator-docs
     check-tripleo:
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-f20
+      - check-tripleo-novabm-overcloud-f20
     gate:
       - gate-tripleo-incubator-docs
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-overcloud-precise
-      - check-tripleo-vlan-precise
+      - check-tripleo-novabm-overcloud-precise
+      - check-tripleo-ironic-vlan-precise
     post:
       - tripleo-incubator-docs
     pre-release:
@@ -2378,9 +2378,9 @@ projects:
       - gate-tuskar-ui-selenium
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
     post:
       - tuskar-ui-branch-tarball
 
@@ -2622,9 +2622,9 @@ projects:
       - gate-swift-dsvm-functional
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
     post:
       - pbr-docs
     pre-release:
@@ -2741,9 +2741,9 @@ projects:
       - check-tempest-dsvm-neutron-aiopcpu
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
 
   - name: openstack-infra/elastic-recheck
     check:
@@ -3138,14 +3138,14 @@ projects:
     check:
       - noop
     check-tripleo:
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-f20
+      - check-tripleo-novabm-overcloud-f20
     gate:
       - noop
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
 
   - name: openstack-infra/zmq-event-publisher
     check: