diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index b6ffef47353..0d044ff05f6 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,5 +1,4 @@
 ci:
-  skip: [shellcheck, shfmt]
 
 exclude: '^.*\.(patch)$'
 
@@ -15,14 +14,17 @@ repos:
         files: packagelist
       - id: mixed-line-ending
         args: ["--fix=lf"]
-  - repo: https://github.com/jumanjihouse/pre-commit-hooks
-    rev: 3.0.0
+  - repo: https://github.com/koalaman/shellcheck-precommit
+    rev: v0.9.0
     hooks:
       - id: shellcheck
         types: []
         args: ["-o", "all", "-e", "2148", "-e", "SC2033", "-e", "SC2032", "-e", "SC2034", "-e", "SC2154", "-e", "SC2312", "-e", "SC2164"]
         files: '^.*\.(pacscript|sh)$'
-      - id: shfmt
+  - repo: https://github.com/pecigonzalo/pre-commit-shfmt
+    sha: master
+    hooks:
+      - id: shell-fmt
         args: ["-i", "2", "-bn", "-ci", "-sr", "-s"]
         types: []
         exclude: |