diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 9b908c6d..85377edb 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,15 +1,6 @@
-# We from the Oslo project decided to pin repos based on the
-# commit hash instead of the version tag to prevend arbitrary
-# code from running in developer's machines.  To update to a
-# newer version, run `pre-commit autoupdate` and then replace
-# the newer versions with their commit hash.
-
-default_language_version:
-  python: python3
-
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: 9136088a246768144165fcc3ecc3d31bb686920a # v3.3.0
+    rev: v5.0.0
     hooks:
       - id: trailing-whitespace
       # Replaces or checks mixed line ending
@@ -27,13 +18,13 @@ repos:
       - id: debug-statements
       - id: check-yaml
         files: .*\.(yaml|yml)$
-  - repo: local
+  - repo: https://opendev.org/openstack/hacking
+    rev: 7.0.0
     hooks:
-      - id: flake8
-        name: flake8
-        additional_dependencies:
-          - hacking>=6.1.0,<6.2.0
-        language: python
-        entry: flake8
-        files: '^.*\.py$'
-        exclude: '^(doc|releasenotes|tools)/.*$'
+      - id: hacking
+        additional_dependencies: []
+  - repo: https://github.com/PyCQA/bandit
+    rev: 1.7.10
+    hooks:
+      - id: bandit
+        args: ['-x', 'tests']
diff --git a/test-requirements.txt b/test-requirements.txt
index e4fcd925..2cd79afa 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,5 +1,3 @@
-hacking>=6.1.0,<6.2.0 # Apache-2.0
-
 fixtures>=3.0.0 # Apache-2.0/BSD
 testscenarios>=0.4 # Apache-2.0/BSD
 stestr>=2.1.0 # Apache-2.0
@@ -15,8 +13,3 @@ oslo.log>=3.36.0  # Apache-2.0
 coverage>=4.0 # Apache-2.0
 
 requests_mock>=1.5.0 # Apache-2.0
-
-# Bandit security code scanner
-bandit>=1.7.0,<1.8.0 # Apache-2.0
-
-pre-commit>=2.6.0 # MIT
diff --git a/tox.ini b/tox.ini
index fd36af85..1a5e7c84 100644
--- a/tox.ini
+++ b/tox.ini
@@ -20,10 +20,10 @@ commands =
   stestr slowest
 
 [testenv:pep8]
+deps =
+  pre-commit>=2.6.0 # MIT
 commands =
   pre-commit run -a
-  # TODO(stephenfin): Add mypy here once it's passing
-  {[testenv:bandit]commands}
 
 [testenv:cover]
 setenv =
@@ -52,10 +52,6 @@ commands =
 commands =
   mypy oslo_config
 
-[testenv:bandit]
-commands =
-  bandit -r oslo_config -x tests -n5
-
 [testenv:releasenotes]
 allowlist_externals =
   rm