diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 9b908c6db..ab651e2c3 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,9 @@ 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$'
+      - id: hacking
+        additional_dependencies: []
         exclude: '^(doc|releasenotes|tools)/.*$'
diff --git a/test-requirements.txt b/test-requirements.txt
index a33d07152..f6be06590 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -27,11 +27,8 @@ psycopg2>=2.8.0 # LGPL/ZPL
 # test
 zake>=0.1.6 # Apache-2.0
 pydotplus>=2.0.2 # MIT License
-hacking<6.2.0,>=6.1.0
 oslotest>=3.2.0 # Apache-2.0
 testtools>=2.2.0 # MIT
 testscenarios>=0.4 # Apache-2.0/BSD
 stestr>=2.0.0 # Apache-2.0
 pifpaf>=0.10.0 # Apache-2.0
-
-pre-commit>=2.6.0 # MIT
diff --git a/tox.ini b/tox.ini
index 83c0f4eb5..8f3adda7d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -36,7 +36,10 @@ allowlist_externals =
   {toxinidir}/tools/update_states.sh
 
 [testenv:pep8]
-commands = pre-commit run -a
+deps =
+    pre-commit
+commands =
+    pre-commit run -a
 
 [testenv:pylint]
 deps =