diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index 7f6435b5e..30c2d40ce 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -8,27 +8,27 @@
     check:
       jobs:
       - openstack-tox-linters
-      - tripleo-ci-centos-8-content-provider: &content_provider
-          dependencies: &deps_lint
+      - tripleo-ci-centos-8-content-provider:
+          dependencies:
             - openstack-tox-linters
       - openstack-tox-docs: &tripleo-docs
           files:
           - ^doc/.*
           - ^README.rst
       - tripleo-ci-centos-8-scenario004-standalone: &scenario004
-          vars: &sa_consumer_vars
+          vars:
             consumer_job: true
             build_container_images: false
             tags:
               - standalone
-          dependencies: &deps
+          dependencies:
             - tripleo-ci-centos-8-content-provider
           files:
             - ^roles/ceph.*$
     gate:
       jobs:
       - openstack-tox-linters
-      - tripleo-ci-centos-8-content-provider: *content_provider
+      - tripleo-ci-centos-8-content-provider
       - openstack-tox-docs: *tripleo-docs
       - tripleo-ci-centos-8-scenario004-standalone: *scenario004
     promote: