diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 13d68fd1fc7fdca9e758d5db887f1b23ee812b77..b25a1a2e4be3eb642f01e55673726b55834c8f32 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -27,22 +27,30 @@ repos:
         exclude: LICENSE
 
   - repo: https://github.com/executablebooks/mdformat.git
-    rev: 0.5.3
+    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.1.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://gitlab.com/devopshq/gitlab-ci-linter
+    rev: v1.0.4
+    hooks:
+      - id: gitlab-ci-linter
+        args:
+          - "--server"
+          - https://git.shore.co.il
+
+  - repo: https://github.com/AleksaC/hadolint-py.git
+    rev: v2.1.0
+    hooks:
+      - id: hadolint