diff --git a/.github/workflows/actions/setup-environment/action.yaml b/.github/workflows/actions/setup-environment/action.yaml
index a829fc9ca..08f2e9a3a 100644
--- a/.github/workflows/actions/setup-environment/action.yaml
+++ b/.github/workflows/actions/setup-environment/action.yaml
@@ -3,9 +3,11 @@ description: Setup node & package manager, checkout code
 runs:
   using: "composite"
   steps:
-    - name: Enable corepack
-      shell: bash
-      run: corepack enable
+    - uses: pnpm/action-setup@v2
+      name: Install pnpm
+      with:
+        version: 8
+        run_install: false
 
     - name: Setup Node.js
       uses: actions/setup-node@v4
diff --git a/.husky/pre-commit b/.husky/pre-commit
index d24fdfc60..a5a29d9f7 100755
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
-npx lint-staged
+pnpm lint-staged
diff --git a/package.json b/package.json
index 94d8223dc..dfc26632f 100644
--- a/package.json
+++ b/package.json
@@ -25,8 +25,8 @@
   },
   "lint-staged": {
     "**/*": [
-      "npx prettier --write --ignore-unknown",
-      "npx eslint --fix"
+      "pnpm prettier --write --ignore-unknown",
+      "pnpm eslint --fix"
     ]
   },
   "resolutions": {