diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f3b1536..fdf2b55 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ env:
 
 jobs:
   lint:
-    runs-on: [self-hosted, X64, Linux, aws, ubuntu, ubuntu-2404]
+    runs-on: ["self-hosted", "linux", "x64", "ubuntu-2404", "aws"]
     steps:
       - uses: actions/checkout@v4
         with:
@@ -40,7 +40,7 @@ jobs:
         run: bun run lint
 
   typecheck:
-    runs-on: [self-hosted, X64, Linux, aws, ubuntu, ubuntu-2404]
+    runs-on: ["self-hosted", "linux", "x64", "ubuntu-2404", "aws"]
     steps:
       - uses: actions/checkout@v4
 
@@ -61,7 +61,7 @@ jobs:
         run: bun run typecheck
 
   test:
-    runs-on: [self-hosted, X64, Linux, aws, ubuntu, ubuntu-2404]
+    runs-on: ["self-hosted", "linux", "x64", "ubuntu-2404", "aws"]
     steps:
       - uses: actions/checkout@v4
 
diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
index a6a1bd9..9ec413a 100644
--- a/.github/workflows/release-please.yml
+++ b/.github/workflows/release-please.yml
@@ -15,7 +15,7 @@ env:
 
 jobs:
   release-please:
-    runs-on: [self-hosted, X64, Linux, aws, ubuntu, ubuntu-2404]
+    runs-on: ["self-hosted", "linux", "x64", "ubuntu-2404", "aws"]
     outputs:
       releases_created: ${{ steps.release.outputs.releases_created }}
       release_created: ${{ steps.release.outputs.release_created }}
@@ -37,7 +37,7 @@ jobs:
   publish:
     needs: release-please
     if: ${{ needs.release-please.outputs.release_created == 'true' }}
-    runs-on: [self-hosted, X64, Linux, aws, ubuntu, ubuntu-2404]
+    runs-on: ["self-hosted", "linux", "x64", "ubuntu-2404", "aws"]
     permissions:
       contents: read
       id-token: write
diff --git a/.husky/pre-commit b/.husky/pre-commit
index ea5a55b..c305a07 100644
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -1 +1,17 @@
+# Add common paths for Homebrew and Bun
+export PATH="/opt/homebrew/bin:/usr/local/bin:$HOME/.bun/bin:$PATH"
+
+# Load Node.js version manager (fnm or nvm)
+if [ -d "$HOME/.local/share/fnm" ]; then
+  # Load fnm
+  export FNM_PATH="$HOME/.local/share/fnm"
+  if [ -f "$FNM_PATH/fnm" ]; then
+    eval "$($FNM_PATH/fnm env --shell bash)"
+  fi
+elif [ -s "$HOME/.nvm/nvm.sh" ]; then
+  # Load nvm
+  export NVM_DIR="$HOME/.nvm"
+  . "$NVM_DIR/nvm.sh"
+fi
+
 bunx lint-staged