diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index 28a3a2f5b..645e37c86 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -29,18 +29,8 @@
             vars: &multi_consumer_vars
               consumer_job: true
               build_container_images: false
-              tags:
-                - undercloud-setup
-                - undercloud-scripts
-                - undercloud-install
-                - undercloud-post-install
-                - tripleo-validations
-                - overcloud-scripts
-                - overcloud-prep-config
-                - overcloud-prep-containers
-                - overcloud-deploy
-                - overcloud-post-deploy
-                - overcloud-validate
+              remove_tags:
+                - build
             dependencies: &deps_cprovider
               - tripleo-ci-centos-8-content-provider
         - tripleo-build-containers-ubi-8: