diff --git a/.ansible-lint b/.ansible-lint
new file mode 100644
index 000000000..40ed743b2
--- /dev/null
+++ b/.ansible-lint
@@ -0,0 +1,3 @@
+skip_list:
+  - '106'  # Role name {} does not match ``^[a-z][a-z0-9_]+$`` pattern'
+  - '208'  # File permissions not mentioned'
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 0ed54242a..9ec4b0c68 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,7 +1,7 @@
 ---
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.1.0
+    rev: v3.2.0
     hooks:
       - id: end-of-file-fixer
       - id: trailing-whitespace
@@ -18,14 +18,14 @@ repos:
       - id: check-yaml
         files: .*\.(yaml|yml)$
   - repo: https://github.com/adrienverge/yamllint.git
-    rev: v1.15.0
+    rev: v1.24.2
     hooks:
       - id: yamllint
         files: \.(yaml|yml)$
         types: [file, yaml]
         entry: yamllint --strict -f parsable
   - repo: https://github.com/ansible/ansible-lint
-    rev: v4.1.1a2
+    rev: v4.3.1
     hooks:
       - id: ansible-lint
         files: \.(yaml|yml)$
@@ -36,7 +36,7 @@ repos:
         #                  Things found within roles.galaxy are external
         #                  and not something maintained here.
   - repo: https://github.com/openstack-dev/bashate.git
-    rev: 0.6.0
+    rev: 2.0.0
     hooks:
       - id: bashate
         entry: bashate --error . --verbose --ignore=E006,E040
diff --git a/LICENSE b/LICENSE
index 68c771a09..67db85882 100644
--- a/LICENSE
+++ b/LICENSE
@@ -173,4 +173,3 @@
       defend, and hold each Contributor harmless for any liability
       incurred by, or claims asserted against, such Contributor by reason
       of your accepting any such warranty or additional liability.
-
diff --git a/_skeleton_role_/defaults/main.yml.j2 b/_skeleton_role_/defaults/main.yml.j2
index 9fc774e2a..f9a442d0e 100644
--- a/_skeleton_role_/defaults/main.yml.j2
+++ b/_skeleton_role_/defaults/main.yml.j2
@@ -19,4 +19,3 @@
 
 # All variables within this role should have a prefix of "tripleo_{{ role_name | replace('-', '_') }}"
 tripleo_{{ role_name | replace('-', '_') }}_debug: false
-
diff --git a/_skeleton_role_/meta/main.yml.j2 b/_skeleton_role_/meta/main.yml.j2
index b8233a2f4..5d53d3bba 100644
--- a/_skeleton_role_/meta/main.yml.j2
+++ b/_skeleton_role_/meta/main.yml.j2
@@ -42,4 +42,3 @@ galaxy_info:
 # List your role dependencies here, one per line. Be sure to remove the '[]' above,
 # if you add dependencies to this list.
 dependencies: []
-
diff --git a/_skeleton_role_/molecule/default/Dockerfile.j2 b/_skeleton_role_/molecule/default/Dockerfile.j2
index 8e43c3378..ec46ad5eb 100644
--- a/_skeleton_role_/molecule/default/Dockerfile.j2
+++ b/_skeleton_role_/molecule/default/Dockerfile.j2
@@ -35,4 +35,3 @@ RUN easy_install {{ pkg }}
 {% endraw %}
 
 CMD ["sh", "-c", "while true; do sleep 10000; done"]
-
diff --git a/_skeleton_role_/molecule/default/playbook.yml.j2 b/_skeleton_role_/molecule/default/playbook.yml.j2
index 0a22b2a1b..8d823ecb6 100644
--- a/_skeleton_role_/molecule/default/playbook.yml.j2
+++ b/_skeleton_role_/molecule/default/playbook.yml.j2
@@ -19,4 +19,3 @@
   hosts: all
   roles:
     - role: "{{ role_name }}"
-
diff --git a/doc/source/roles/role-backup-and-restore.rst b/doc/source/roles/role-backup-and-restore.rst
index b6197fa7a..02161b1c6 100644
--- a/doc/source/roles/role-backup-and-restore.rst
+++ b/doc/source/roles/role-backup-and-restore.rst
@@ -136,4 +136,3 @@ Lastly, we execute the actual backup step. With or without ceph.
       --become-user root \
       --tags bar_create_recover_image \
       ~/bar_rear_create_restore_images.yaml
-
diff --git a/setup.cfg b/setup.cfg
index 1372a0ccc..e4f7eafd2 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -31,4 +31,4 @@ universal = 1
 
 [pbr]
 skip_authors = True
-skip_changelog = True
\ No newline at end of file
+skip_changelog = True
diff --git a/test-requirements.txt b/test-requirements.txt
index 93e532ef6..b62110526 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,4 +1,3 @@
-pre-commit # MIT
 netaddr # BSD
 mock>=2.0.0 # BSD
 stestr>=2.0.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 6c3c54622..98f2f2b8c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -25,6 +25,8 @@ setenv =
   # paramiko CryptographyDeprecationWarning: https://github.com/ansible/ansible/issues/52598
   PYTHONWARNINGS=ignore:DEPRECATION::pip._internal.cli.base_command,ignore::UserWarning
   PIP_DISABLE_PIP_VERSION_CHECK=1
+  linters: UPPER_CONSTRAINTS_FILE=/dev/null
+
 sitepackages = True
 deps =
    -r {toxinidir}/test-requirements.txt
@@ -43,9 +45,14 @@ deps = bindep
 commands = bindep test
 
 [testenv:pep8]
+setenv =
+  UPPER_CONSTRAINTS_FILE=file:///dev/null
 envdir = {toxworkdir}/linters
+deps =
+    {[testenv:linters]deps}
 commands =
     python -m pre_commit run flake8 -a
+sitepackages = False
 
 [testenv:ansible-lint]
 envdir = {toxworkdir}/linters
@@ -56,42 +63,18 @@ commands =
            ansible-galaxy install -fr {toxinidir}/tripleo_ansible/ansible-role-requirements.yml"
   python -m pre_commit run ansible-lint -a
 
-[testenv:yamllint]
-envdir = {toxworkdir}/linters
-deps = {[testenv:linters]deps}
-commands =
-    python -m pre_commit run yamllint -a
-
-[testenv:bashate]
-envdir = {toxworkdir}/linters
-deps = {[testenv:linters]deps}
-commands =
-    python -m pre_commit run bashate -a
-
-[testenv:whitespace]
-envdir = {toxworkdir}/linters
-deps = {[testenv:linters]deps}
-commands =
-    python -m pre_commit run trailing-whitespace -a
-
-[testenv:shebangs]
-envdir = {toxworkdir}/linters
-deps = {[testenv:linters]deps}
-commands =
-    python -m pre_commit run check-executables-have-shebangs -a
-
 [testenv:linters]
+sitepackages = False
 deps =
-    -r {toxinidir}/requirements.txt
-    -r {toxinidir}/test-requirements.txt
-    -r {toxinidir}/molecule-requirements.txt
+    pre-commit>=2.7.1 # MIT
+    virtualenv>=20.0.31
+    flake8
+    -r  {toxinidir}/ansible-requirements.txt
 commands =
-    {[testenv:pep8]commands}
-    {[testenv:ansible-lint]commands}
-    {[testenv:bashate]commands}
-    {[testenv:yamllint]commands}
-    {[testenv:whitespace]commands}
-    {[testenv:shebangs]commands}
+    pip check
+    bash -c "ANSIBLE_ROLES_PATH='{toxinidir}/tripleo_ansible/roles.galaxy' \
+           ansible-galaxy install -fr {toxinidir}/tripleo_ansible/ansible-role-requirements.yml"
+    python -m pre_commit run -a
     bash -c '{toxinidir}/scripts/detect-broken-symlinks.sh'
 
 [testenv:releasenotes]
diff --git a/tripleo_ansible/roles/aide/molecule/default/Dockerfile b/tripleo_ansible/roles/aide/molecule/default/Dockerfile
index c58ca6538..e0534b4d1 100644
--- a/tripleo_ansible/roles/aide/molecule/default/Dockerfile
+++ b/tripleo_ansible/roles/aide/molecule/default/Dockerfile
@@ -34,4 +34,4 @@ RUN easy_install {{ pkg }}
 {% endfor %}
 
 
-CMD ["sh", "-c", "while true; do sleep 10000; done"]
\ No newline at end of file
+CMD ["sh", "-c", "while true; do sleep 10000; done"]
diff --git a/tripleo_ansible/roles/octavia-controller-config/templates/ifcfg.j2 b/tripleo_ansible/roles/octavia-controller-config/templates/ifcfg.j2
index 7b2f33ff2..d17b59359 100644
--- a/tripleo_ansible/roles/octavia-controller-config/templates/ifcfg.j2
+++ b/tripleo_ansible/roles/octavia-controller-config/templates/ifcfg.j2
@@ -16,4 +16,3 @@ OVS_EXTRA="-- set Interface {{ mgmt_port_dev }} external-ids:iface-status=active
            -- set Interface {{ mgmt_port_dev }} external-ids:skip_cleanup=true \
            -- set Interface {{ mgmt_port_dev }} mac=\"{{ mgmt_port_mac }}\" \
            -- set Interface {{ mgmt_port_dev }} other-config:hwaddr={{ mgmt_port_mac }}"
-
diff --git a/tripleo_ansible/roles/test_package_action/molecule/default/Dockerfile b/tripleo_ansible/roles/test_package_action/molecule/default/Dockerfile
index c58ca6538..e0534b4d1 100644
--- a/tripleo_ansible/roles/test_package_action/molecule/default/Dockerfile
+++ b/tripleo_ansible/roles/test_package_action/molecule/default/Dockerfile
@@ -34,4 +34,4 @@ RUN easy_install {{ pkg }}
 {% endfor %}
 
 
-CMD ["sh", "-c", "while true; do sleep 10000; done"]
\ No newline at end of file
+CMD ["sh", "-c", "while true; do sleep 10000; done"]
diff --git a/tripleo_ansible/roles/test_package_action/molecule/negative/Dockerfile b/tripleo_ansible/roles/test_package_action/molecule/negative/Dockerfile
index c58ca6538..e0534b4d1 100644
--- a/tripleo_ansible/roles/test_package_action/molecule/negative/Dockerfile
+++ b/tripleo_ansible/roles/test_package_action/molecule/negative/Dockerfile
@@ -34,4 +34,4 @@ RUN easy_install {{ pkg }}
 {% endfor %}
 
 
-CMD ["sh", "-c", "while true; do sleep 10000; done"]
\ No newline at end of file
+CMD ["sh", "-c", "while true; do sleep 10000; done"]
diff --git a/tripleo_ansible/roles/test_package_action/molecule/positive/Dockerfile b/tripleo_ansible/roles/test_package_action/molecule/positive/Dockerfile
index c58ca6538..e0534b4d1 100644
--- a/tripleo_ansible/roles/test_package_action/molecule/positive/Dockerfile
+++ b/tripleo_ansible/roles/test_package_action/molecule/positive/Dockerfile
@@ -34,4 +34,4 @@ RUN easy_install {{ pkg }}
 {% endfor %}
 
 
-CMD ["sh", "-c", "while true; do sleep 10000; done"]
\ No newline at end of file
+CMD ["sh", "-c", "while true; do sleep 10000; done"]
diff --git a/tripleo_ansible/roles/tripleo-image-serve/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo-image-serve/molecule/default/Dockerfile
index 22622836b..8943173f9 100644
--- a/tripleo_ansible/roles/tripleo-image-serve/molecule/default/Dockerfile
+++ b/tripleo_ansible/roles/tripleo-image-serve/molecule/default/Dockerfile
@@ -33,4 +33,4 @@ RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y pyth
 RUN easy_install {{ pkg }}
 {% endfor %}
 
-CMD ["sh", "-c", "while true; do sleep 10000; done"]
\ No newline at end of file
+CMD ["sh", "-c", "while true; do sleep 10000; done"]
diff --git a/tripleo_ansible/roles/tripleo-image-serve/molecule/legacy_vars/Dockerfile b/tripleo_ansible/roles/tripleo-image-serve/molecule/legacy_vars/Dockerfile
index 22622836b..8943173f9 100644
--- a/tripleo_ansible/roles/tripleo-image-serve/molecule/legacy_vars/Dockerfile
+++ b/tripleo_ansible/roles/tripleo-image-serve/molecule/legacy_vars/Dockerfile
@@ -33,4 +33,4 @@ RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y pyth
 RUN easy_install {{ pkg }}
 {% endfor %}
 
-CMD ["sh", "-c", "while true; do sleep 10000; done"]
\ No newline at end of file
+CMD ["sh", "-c", "while true; do sleep 10000; done"]
diff --git a/tripleo_ansible/roles/tripleo-keystone-resources/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo-keystone-resources/molecule/default/Dockerfile
index c58ca6538..e0534b4d1 100644
--- a/tripleo_ansible/roles/tripleo-keystone-resources/molecule/default/Dockerfile
+++ b/tripleo_ansible/roles/tripleo-keystone-resources/molecule/default/Dockerfile
@@ -34,4 +34,4 @@ RUN easy_install {{ pkg }}
 {% endfor %}
 
 
-CMD ["sh", "-c", "while true; do sleep 10000; done"]
\ No newline at end of file
+CMD ["sh", "-c", "while true; do sleep 10000; done"]
diff --git a/tripleo_ansible/roles/tripleo-nova-image-cache/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo-nova-image-cache/molecule/default/Dockerfile
index c58ca6538..e0534b4d1 100644
--- a/tripleo_ansible/roles/tripleo-nova-image-cache/molecule/default/Dockerfile
+++ b/tripleo_ansible/roles/tripleo-nova-image-cache/molecule/default/Dockerfile
@@ -34,4 +34,4 @@ RUN easy_install {{ pkg }}
 {% endfor %}
 
 
-CMD ["sh", "-c", "while true; do sleep 10000; done"]
\ No newline at end of file
+CMD ["sh", "-c", "while true; do sleep 10000; done"]
diff --git a/tripleo_ansible/roles/tripleo-nova-image-cache/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-nova-image-cache/molecule/default/molecule.yml
index a92a446f3..f2b6c89ed 100644
--- a/tripleo_ansible/roles/tripleo-nova-image-cache/molecule/default/molecule.yml
+++ b/tripleo_ansible/roles/tripleo-nova-image-cache/molecule/default/molecule.yml
@@ -10,6 +10,8 @@ platforms:
     image: centos:7
     dockerfile: Dockerfile
     pkg_extras: python-setuptools
+    volumes:
+      - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro
     easy_install:
       - pip
     environment: &env
@@ -21,6 +23,8 @@ platforms:
     image: centos:8
     dockerfile: Dockerfile
     pkg_extras: python*-setuptools
+    volumes:
+      - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro
     environment:
       <<: *env
 
diff --git a/tripleo_ansible/roles/tripleo-systemd-wrapper/templates/service_sync.j2 b/tripleo_ansible/roles/tripleo-systemd-wrapper/templates/service_sync.j2
index f1f08a698..857d55cda 100644
--- a/tripleo_ansible/roles/tripleo-systemd-wrapper/templates/service_sync.j2
+++ b/tripleo_ansible/roles/tripleo-systemd-wrapper/templates/service_sync.j2
@@ -69,4 +69,3 @@ done
 :> "$jobs_file"
 
 flock -u "$lock_fd"
-
diff --git a/tripleo_ansible/roles/tuned/molecule/default/Dockerfile b/tripleo_ansible/roles/tuned/molecule/default/Dockerfile
index 22622836b..8943173f9 100644
--- a/tripleo_ansible/roles/tuned/molecule/default/Dockerfile
+++ b/tripleo_ansible/roles/tuned/molecule/default/Dockerfile
@@ -33,4 +33,4 @@ RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y pyth
 RUN easy_install {{ pkg }}
 {% endfor %}
 
-CMD ["sh", "-c", "while true; do sleep 10000; done"]
\ No newline at end of file
+CMD ["sh", "-c", "while true; do sleep 10000; done"]
diff --git a/tripleo_ansible/roles/tuned/molecule/isolated/Dockerfile b/tripleo_ansible/roles/tuned/molecule/isolated/Dockerfile
index 22622836b..8943173f9 100644
--- a/tripleo_ansible/roles/tuned/molecule/isolated/Dockerfile
+++ b/tripleo_ansible/roles/tuned/molecule/isolated/Dockerfile
@@ -33,4 +33,4 @@ RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y pyth
 RUN easy_install {{ pkg }}
 {% endfor %}
 
-CMD ["sh", "-c", "while true; do sleep 10000; done"]
\ No newline at end of file
+CMD ["sh", "-c", "while true; do sleep 10000; done"]