diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index 8f6677035..6da381f76 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -13,3 +13,12 @@
       - ci/playbooks/run.yml
     timeout: 1800
     voting: true
+
+- job:
+    name: tripleo-ci-centos-8-standalone-tv-validation
+    parent: tripleo-ci-centos-8-standalone
+    vars:
+      featureset: '052'
+      validate_services: true
+      enable_validation: true
+      component: validation
diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index c88f1cc7f..dc4d3a09f 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -1,7 +1,6 @@
 ---
 - project:
     templates:
-      - tripleo-multinode-container-minimal-pipeline
       - tripleo-validations-molecule-jobs
       - release-notes-jobs-python3
     check:
@@ -17,21 +16,24 @@
         - tripleo-ci-centos-8-content-provider:
             dependencies:
               - openstack-tox-linters
-        - tripleo-ci-centos-8-scenario004-standalone: &scenario004
-            vars: &vars_scen004
+        - tripleo-ci-centos-8-standalone-tv-validation:
+            vars: &consumer_vars
               consumer_job: true
               build_container_images: false
-            dependencies: &deps
+              remove_tags:
+                - build
+            dependencies:
               - tripleo-ci-centos-8-content-provider
-            files:
-              - ^roles/ceph.*$
         - openstack-tox-py36
     gate:
       jobs:
         - openstack-tox-linters
         - openstack-tox-docs: *tripleo-docs
         - tripleo-ci-centos-8-content-provider
-        - tripleo-ci-centos-8-scenario004-standalone: *scenario004
+        - tripleo-ci-centos-8-standalone-tv-validation:
+            vars: *consumer_vars
+            dependencies:
+              - tripleo-ci-centos-8-content-provider
         - openstack-tox-py36
 
     promote: