diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index fb59878f00..a6894b2a98 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -15311,7 +15311,7 @@
       # containerized undercloud-only job
       - '{trigger}-tripleo-ci-{jobname}{suffix}':
           jobname: 'centos-7-undercloud-containers'
-          suffix: '-nv'
+          suffix: ''
           type: 'undercloud-containers'
           node: centos-7
           trigger: 'gate'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 36bfe3be30..041d620b2e 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1102,6 +1102,7 @@ project-templates:
       - gate-tripleo-ci-centos-7-scenario004-multinode-oooq-container
       - gate-tripleo-ci-centos-7-containers-multinode
       - gate-tripleo-ci-centos-7-nonha-multinode-updates-nv
+      - gate-tripleo-ci-centos-7-undercloud-containers
     gate:
       - gate-tripleo-ci-centos-7-nonha-multinode-oooq
       - gate-tripleo-ci-centos-7-containers-multinode
@@ -1112,6 +1113,7 @@ project-templates:
       - gate-tripleo-ci-centos-7-scenario003-multinode-oooq-container
       - gate-tripleo-ci-centos-7-scenario004-multinode-oooq
       - gate-tripleo-ci-centos-7-scenario004-multinode-oooq-container
+      - gate-tripleo-ci-centos-7-undercloud-containers
     experimental:
       - gate-tripleo-ci-centos-7-scenario005-multinode-oooq-nv
       - gate-tripleo-ci-centos-7-scenario006-multinode-oooq-nv
@@ -1125,7 +1127,6 @@ project-templates:
     check:
       - gate-tripleo-ci-centos-7-undercloud-oooq
       - gate-tripleo-ci-centos-7-undercloud-upgrades-nv
-      - gate-tripleo-ci-centos-7-undercloud-containers-nv
     gate:
       - gate-tripleo-ci-centos-7-undercloud-oooq
 
@@ -18810,7 +18811,6 @@ projects:
     check:
       - gate-tripleo-heat-templates-pep8-ubuntu-xenial
       - gate-tripleo-ci-centos-7-3nodes-multinode-nv
-      - gate-tripleo-ci-centos-7-undercloud-containers-nv
     post:
       - tripleo-heat-templates-branch-tarball
     gate: