diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 1a2dcf9c..b80dd837 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,57 +1,49 @@
 repos:
-- repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v2.4.0
-  hooks:
-  - id: trailing-whitespace
-  - id: check-json
-  - id: check-yaml
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.1.0
+    hooks:
+      - id: trailing-whitespace
+      - id: check-json
+      - id: check-yaml
 
-- repo: https://gitlab.com/pycqa/flake8
-  rev: 3.8.3
-  hooks:
-  - id: flake8
+  - repo: https://gitlab.com/pycqa/flake8
+    rev: 4.0.1
+    hooks:
+      - id: flake8
 
-- repo: https://github.com/codespell-project/codespell
-  rev: v1.16.0
-  hooks:
-  - id: codespell
-    exclude: TODO
-    args: [-L iff, -L gae]
+  - repo: https://github.com/codespell-project/codespell
+    rev: v2.1.0
+    hooks:
+      - id: codespell
+        name: Check source code spelling
+        args: [-L iff, -L gae, -L sur]
+        stages: [commit]
+      - id: codespell
+        name: Check commit message spelling
+        stages: [commit-msg]
 
-- repo: local
-  hooks:
-  - id: mypy
-    name: mypy
-    entry: mypy
-    args: [swh]
-    pass_filenames: false
-    language: system
-    types: [python]
+  - repo: local
+    hooks:
+      - id: mypy
+        name: mypy
+        entry: mypy
+        args: [swh]
+        pass_filenames: false
+        language: system
+        types: [python]
+      - id: check-bumped-dbversion
+        name: check-bumped-dbversion
+        files: 'sql/upgrades/.*\.sql'
+        entry: grep
+        args: ["insert into dbversion"]
+        language: system
 
-  - id: check-bumped-dbversion
-    name: check-bumped-dbversion
-    files: 'sql/upgrades/.*\.sql'
-    entry: grep
-    args: ['insert into dbversion']
-    language: system
+  - repo: https://github.com/PyCQA/isort
+    rev: 5.10.1
+    hooks:
+      - id: isort
 
-- repo: https://github.com/PyCQA/isort
-  rev: 5.5.2
-  hooks:
-  - id: isort
-
-- repo: https://github.com/python/black
-  rev: 19.10b0
-  hooks:
-  - id: black
-
-# unfortunately, we are far from being able to enable this...
-#- repo: https://github.com/PyCQA/pydocstyle.git
-#  rev: 4.0.0
-#  hooks:
-#  - id: pydocstyle
-#    name: pydocstyle
-#    description: pydocstyle is a static analysis tool for checking compliance with Python docstring conventions.
-#    entry: pydocstyle --convention=google
-#    language: python
-#    types: [python]
+  - repo: https://github.com/python/black
+    rev: 19.10b0
+    hooks:
+      - id: black