diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 7b2ecc35f82333abcd29b57c6be44208e9f8ebf6..d5013d0ba0f840aa37d4c191a95959fa2bd43a93 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,41 +1,76 @@
 ---
 repos:
-  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.4.0
+  - repo: https://github.com/pre-commit/pre-commit-hooks.git
+    rev: v4.3.0
     hooks:
-      - id: check-executables-have-shebangs
       - id: check-merge-conflict
-      - id: check-toml
-        files: Pipfile
+      - id: check-yaml
+      - id: detect-private-key
+      - id: end-of-file-fixer
       - id: trailing-whitespace
+        exclude: \.diff$
 
-  - repo: https://github.com/Yelp/detect-secrets
-    rev: v0.14.3
+  - repo: https://github.com/codespell-project/codespell.git
+    rev: v2.1.0
     hooks:
-      - id: detect-secrets
+      - id: codespell
 
-  - repo: https://github.com/adrienverge/yamllint
-    rev: v1.25.0
+  - repo: https://github.com/Yelp/detect-secrets.git
+    rev: v1.2.0
     hooks:
-      - id: yamllint
+      - id: detect-secrets
 
-  - repo: https://github.com/amperser/proselint/
+  - repo: https://github.com/amperser/proselint.git
     rev: 0.10.2
     hooks:
       - id: proselint
         types: [plain-text]
         exclude: LICENSE
 
-  - repo: https://github.com/ambv/black
-    rev: 20.8b1
+  - repo: https://gitlab.com/devopshq/gitlab-ci-linter.git
+    rev: v1.0.3
+    hooks:
+      - id: gitlab-ci-linter
+        args:
+          - "--server"
+          - https://git.shore.co.il
+
+  - repo: https://git.shore.co.il/nimrod/yamltool.git
+    rev: v0.1.2
+    hooks:
+      - id: yamltool
+
+  - repo: https://github.com/adrienverge/yamllint.git
+    rev: v1.27.1
+    hooks:
+      - id: yamllint
+
+  - repo: https://github.com/executablebooks/mdformat.git
+    rev: 0.7.14
+    hooks:
+      - id: mdformat
+
+  - repo: https://github.com/AleksaC/hadolint-py.git
+    rev: v2.10.0
+    hooks:
+      - id: hadolint
+
+  - repo: https://github.com/ambv/black.git
+    rev: 22.6.0
     hooks:
       - id: black
         args:
           - |
-              --line-length=79
+            --line-length=79
 
-  - repo: https://github.com/PyCQA/prospector
-    rev: 1.3.1
+  - repo: https://github.com/PyCQA/isort
+    rev: 5.10.1
+    hooks:
+      - id: isort
+        args: ["--filter-files", "--profile", "black"]
+
+  - repo: https://github.com/PyCQA/prospector.git
+    rev: 1.7.7
     hooks:
       - id: prospector
         args:
@@ -62,7 +97,7 @@ repos:
           - pyroma
 
   - repo: https://gitlab.com/pycqa/flake8.git
-    rev: 3.8.4
+    rev: 3.9.2
     hooks:
       - id: flake8
         args:
@@ -70,13 +105,29 @@ repos:
             --doctests
         additional_dependencies:
           - flake8-bugbear
+          - flake8-builtins
+          - flake8-comprehensions
+          - flake8-loopy
+          - flake8-pie
+          - flake8-tuple
+          - flake8-warnings
 
-  - repo: https://github.com/executablebooks/mdformat.git
-    rev: 0.5.3
+  - repo: https://github.com/Lucas-C/pre-commit-hooks-safety.git
+    rev: v1.3.0
     hooks:
-      - id: mdformat
+      - id: python-safety-dependencies-check
 
-  - repo: https://git.shore.co.il/nimrod/docker-pre-commit.git/
-    rev: v0.3.0
+  - repo: https://github.com/asottile/pyupgrade.git
+    rev: v2.37.1
     hooks:
-      - id: hadolint
+      - id: pyupgrade
+
+  - repo: https://github.com/hadialqattan/pycln.git
+    rev: v2.0.2
+    hooks:
+      - id: pycln
+
+  - repo: https://github.com/PyCQA/docformatter.git
+    rev: v1.4
+    hooks:
+      - id: docformatter