diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 1b526cc33029eae53c6d8e4b4067c9c53db9ede8..82bb83999d1343eeb85afd4b31c24ab250386fa7 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -31,14 +31,6 @@ repos:
       - id: detect-secrets
         exclude: ^Ansible/roles/router/files/nsd/
 
-  - repo: https://gitlab.com/devopshq/gitlab-ci-linter.git
-    rev: v1.0.4
-    hooks:
-      - id: gitlab-ci-linter
-        args:
-          - "--server"
-          - https://git.shore.co.il
-
   - repo: https://github.com/amperser/proselint.git
     rev: 0.10.2
     hooks:
@@ -46,6 +38,14 @@ repos:
         types: [plain-text]
         exclude: LICENSE
 
+  - repo: https://gitlab.com/devopshq/gitlab-ci-linter.git
+    rev: v1.0.2
+    hooks:
+      - id: gitlab-ci-linter
+        args:
+          - "--server"
+          - https://git.shore.co.il
+
   - repo: https://github.com/adrienverge/yamllint.git
     rev: v1.26.3
     hooks:
@@ -56,74 +56,14 @@ repos:
     hooks:
       - id: mdformat
 
-  - repo: https://github.com/ambv/black.git
-    rev: 21.9b0
-    hooks:
-      - id: black
-        args:
-          - |
-              --line-length=79
-
-  - repo: https://github.com/Lucas-C/pre-commit-hooks-markup.git
-    rev: v1.0.1
-    hooks:
-      - id: rst-linter
-
-  - repo: https://github.com/myint/rstcheck.git
-    rev: master
-    hooks:
-      - id: rstcheck
-
-  - repo: https://github.com/PyCQA/prospector.git
-    rev: 1.5.1
-    hooks:
-      - id: prospector
-        args:
-          - |-
-            --max-line-length=79
-          - |-
-            --with-tool=pyroma
-          - |-
-            --with-tool=bandit
-          - |-
-            --without-tool=pep257
-          - |-
-            --doc-warnings
-          - |-
-            --test-warnings
-          - |-
-            --full-pep8
-          - |-
-            --strictness=high
-          - |-
-            --no-autodetect
-        additional_dependencies:
-          - bandit
-          - pyroma
-
-  - repo: https://gitlab.com/pycqa/flake8.git
-    rev: 3.9.2
-    hooks:
-      - id: flake8
-        args:
-          - |-
-            --doctests
-        additional_dependencies:
-          - flake8-bugbear
-
-  - repo: https://github.com/pre-commit/pre-commit.git
-    rev: v2.15.0
-    hooks:
-      - id: validate_manifest
-
   - repo: https://git.shore.co.il/nimrod/pre-commit-hooks.git
-    rev: v0.2.0
+    rev: v0.3.0
     hooks:
       - id: shell-validate
       - id: ansible-syntax-check
+        files: ^Ansible/[a-z]*\.yaml$
       - id: terraform-fmt
       - id: terraform-validate
-      - id: poetry-check
       - id: docker-compose
 
   - repo: https://github.com/shellcheck-py/shellcheck-py.git
@@ -132,11 +72,11 @@ repos:
       - id: shellcheck
 
   - repo: https://github.com/ansible/ansible-lint.git
-    rev: v5.1.3
+    rev: v5.2.1
     hooks:
       - id: ansible-lint
 
   - repo: https://github.com/AleksaC/hadolint-py.git
-    rev: v2.1.0
+    rev: v2.8.0
     hooks:
       - id: hadolint