diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index a4e34a6bdf639466c329f2693fdb5a99b0dde19a..7daeb5a86ff7473a64a5be6c7b438524ca5e9fad 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -24,18 +24,18 @@ repos:
     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: docker-compose
+      - id: shell-validate
+
+  - repo: https://github.com/AleksaC/hadolint-py.git
+    rev: v2.1.0
+    hooks:
+      - id: hadolint