diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 44ee57daa7c1b302da1bc9e6051d600257803974..f017b009bc3221028cd1983b4c4f4b22ec4cec8c 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -33,28 +33,28 @@ repos:
         exclude: LICENSE
 
   - repo: https://github.com/executablebooks/mdformat.git
-    rev: 0.7.9
+    rev: 0.7.10
     hooks:
       - id: mdformat
 
-  - repo: https://git.shore.co.il/nimrod/shell-pre-commit.git
-    rev: v0.6.0
-    hooks:
-      - id: shell-lint
-
   - repo: https://github.com/shellcheck-py/shellcheck-py.git
     rev: v0.7.2.1
     hooks:
       - id: shellcheck
 
-  - repo: https://git.shore.co.il/nimrod/docker-pre-commit.git/
-    rev: v0.3.0
+  - repo: https://git.shore.co.il/nimrod/pre-commit-hooks.git
+    rev: v0.2.0
     hooks:
-      - id: hadolint
+      - id: shell-validate
       - id: docker-compose
 
+  - repo: https://github.com/AleksaC/hadolint-py.git
+    rev: v2.7.0
+    hooks:
+      - id: hadolint
+
   - repo: https://github.com/ambv/black
-    rev: 21.7b0
+    rev: 21.9b0
     hooks:
       - id: black
         args:
@@ -62,7 +62,7 @@ repos:
               --line-length=79
 
   - repo: https://github.com/PyCQA/prospector
-    rev: 1.4.1.1
+    rev: 1.5.1
     hooks:
       - id: prospector
         args: