diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 71f8df835b..a69e0b31cb 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -14761,17 +14761,17 @@
           branch-override: 'stable/newton'
           timeout: 180
       - '{trigger}-tripleo-ci-{jobname}{suffix}':
-          jobname: 'centos-7-ovb-nonha-puppet-newton'
+          jobname: 'centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-newton'
           suffix: ''
-          type: 'ovb-nonha'
+          type: 'ovb-1ctlr_1comp_1ceph-featureset024'
           node: tripleo-centos-7
           trigger: 'gate'
           branch-override: 'stable/newton'
           timeout: 180
       - '{trigger}-tripleo-ci-{jobname}{suffix}':
-          jobname: 'centos-7-ovb-nonha-puppet-ocata'
+          jobname: 'centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-ocata'
           suffix: ''
-          type: 'ovb-nonha'
+          type: 'ovb-1ctlr_1comp_1ceph-featureset024'
           node: tripleo-centos-7
           trigger: 'gate'
           branch-override: 'stable/ocata'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index c3a174567c..47a5ea422f 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1788,11 +1788,11 @@ jobs:
     branch: ^(?!stable/(newton|ocata)).*$
 
   # Test TripleO stable/newton in Puppet OpenStack CI
-  - name: ^gate-tripleo-ci-centos-7-ovb-nonha-puppet-newton$
+  - name: ^gate-tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-newton$
     branch: ^(stable/newton).*$
 
   # Test TripleO stable/ocata in Puppet OpenStack CI
-  - name: ^gate-tripleo-ci-centos-7-ovb-nonha-puppet-ocata$
+  - name: ^gate-tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-ocata$
     branch: ^(stable/ocata).*$
 
   # Skip non-doc jobs for doc-only networking-odl changes.  Since
@@ -14718,8 +14718,8 @@ projects:
       - name: tripleo-scenario-jobs-scenario004
       - name: puppet-release-jobs
     check-tripleo:
-      - gate-tripleo-ci-centos-7-ovb-nonha-puppet-newton
-      - gate-tripleo-ci-centos-7-ovb-nonha-puppet-ocata
+      - gate-tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-newton
+      - gate-tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-ocata
 
   - name: openstack/puppet-cinder
     template:
@@ -14737,8 +14737,8 @@ projects:
       - name: tripleo-scenario-jobs-scenario002
       - name: puppet-release-jobs
     check-tripleo:
-      - gate-tripleo-ci-centos-7-ovb-nonha-puppet-newton
-      - gate-tripleo-ci-centos-7-ovb-nonha-puppet-ocata
+      - gate-tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-newton
+      - gate-tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-ocata
 
   - name: openstack/puppet-cloudkitty
     template: