diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index b083313c9..34d282b5a 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -21,7 +21,7 @@ repos:
         entry: flake8 --ignore=E24,E121,E122,E123,E124,E126,E226,E265,E305,E402,F401,F405,E501,E704,F403,F841,W503,W605
 
   - repo: https://github.com/adrienverge/yamllint.git
-    rev: v1.26.1
+    rev: v1.33.0
     hooks:
       - id: yamllint
         files: \.(yaml|yml)$
diff --git a/roles/overcloud_service_status/resources/playbooks/prepare.yml b/roles/overcloud_service_status/resources/playbooks/prepare.yml
index c538eea76..7df04594e 100644
--- a/roles/overcloud_service_status/resources/playbooks/prepare.yml
+++ b/roles/overcloud_service_status/resources/playbooks/prepare.yml
@@ -3,10 +3,10 @@
   hosts: all
 
   tasks:
-  - name: Copy http_server.py
-    copy:
-      src: ../scripts/http_server.py
-      dest: /
+    - name: Copy http_server.py
+      copy:
+        src: ../scripts/http_server.py
+        dest: /
 
-  - name: "Start http_server.py scenario {{ molecule_yml.scenario.name }}"
-    shell: cd /; nohup python3 /http_server.py --scenario {{ molecule_yml.scenario.name }} > http_server.log 2>&1 &
+    - name: "Start http_server.py scenario {{ molecule_yml.scenario.name }}"
+      shell: cd /; nohup python3 /http_server.py --scenario {{ molecule_yml.scenario.name }} > http_server.log 2>&1 &
diff --git a/roles/validation_init/files/_skeleton_role_/molecule/default/verify.yml b/roles/validation_init/files/_skeleton_role_/molecule/default/verify.yml
index 8875eafd2..cb94e56a6 100644
--- a/roles/validation_init/files/_skeleton_role_/molecule/default/verify.yml
+++ b/roles/validation_init/files/_skeleton_role_/molecule/default/verify.yml
@@ -18,7 +18,7 @@
   hosts: all
   gather_facts: false
   tasks:
-  # This is an example playbook to execute your ansible tests.
-  - name: Example assertion
-    assert:
-      that: true
+    # This is an example playbook to execute your ansible tests.
+    - name: Example assertion
+      assert:
+        that: true
diff --git a/tox.ini b/tox.ini
index 510815b1d..6d707eaff 100644
--- a/tox.ini
+++ b/tox.ini
@@ -56,7 +56,6 @@ commands = oslo_debug_helper {posargs}
 deps =
     -r {toxinidir}/requirements.txt
     -r {toxinidir}/test-requirements.txt
-    -r {toxinidir}/molecule-requirements.txt
     -c {env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
 commands =
     ansible-galaxy install -fr {toxinidir}/ansible-collections-requirements.yml
diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index 3e8a24600..638e63506 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -1,82 +1,14 @@
 ---
 - project:
     templates:
-      - tripleo-validations-molecule-jobs
-      - release-notes-jobs-python3
       - check-requirements
     check:
       jobs:
         - openstack-tox-linters
         - openstack-tox-py38
         - openstack-tox-py39
-        - tripleo-ci-centos-9-content-provider:
-            irrelevant-files: &docs_only_files
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^releasenotes/.*$
-            dependencies:
-              - openstack-tox-linters
-              - openstack-tox-py38
-              - openstack-tox-py39
-        - tripleo-ci-centos-9-standalone-tv-validation:
-            irrelevant-files: *docs_only_files
-            vars: &consumer_vars
-              consumer_job: true
-              build_container_images: false
-            dependencies:
-              - tripleo-ci-centos-9-content-provider
-        - tripleo-ci-centos-9-containers-multinode:
-            irrelevant-files: *docs_only_files
-            vars:
-              <<: *consumer_vars
-              enable_validation: true
-              playbooks:
-                - multinode.yml
-              remove_tags:
-                - build
-              validations_inventory: ""
-            dependencies:
-              - tripleo-ci-centos-9-content-provider
-        - openstack-tox-docs: &tripleo-docs
-            files:
-              - ^doc/.*
-              - ^groups.yaml
-              - ^molecule-requirements.txt
-              - ^requirements.txt
-              - ^README.rst
-              - ^tripleo_validations/.*
-              - ^roles/.*
-              - ^playbooks/.*
-              - ^library/.*
     gate:
       jobs:
         - openstack-tox-linters
         - openstack-tox-py38
         - openstack-tox-py39
-        - tripleo-ci-centos-9-content-provider:
-            irrelevant-files: *docs_only_files
-            dependencies:
-              - openstack-tox-linters
-              - openstack-tox-py38
-              - openstack-tox-py39
-        - openstack-tox-docs: *tripleo-docs
-        - tripleo-ci-centos-9-standalone-tv-validation:
-            irrelevant-files: *docs_only_files
-            vars: *consumer_vars
-            dependencies:
-              - tripleo-ci-centos-9-content-provider
-        - tripleo-ci-centos-9-containers-multinode:
-            irrelevant-files: *docs_only_files
-            vars:
-              <<: *consumer_vars
-              enable_validation: true
-              playbooks:
-                - multinode.yml
-              remove_tags:
-                - build
-            dependencies:
-              - tripleo-ci-centos-9-content-provider
-
-    promote:
-      jobs:
-        - promote-openstack-tox-docs: *tripleo-docs