diff --git a/.husky/pre-commit b/.husky/pre-commit
index 76291bd8..79d371fc 100755
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -1,8 +1,13 @@
 #!/bin/sh
+echo "Running pre-commit hook"
+
 . "$(dirname "$0")/_/husky.sh"
 
 set -e
 
+fnm use || true
+nvm use || true
+
 corepack enable
 yarn lint-staged
 
diff --git a/scripts/setup.sh b/scripts/setup.sh
index c10039a1..ccbfe90c 100755
--- a/scripts/setup.sh
+++ b/scripts/setup.sh
@@ -1,7 +1,10 @@
 #!/bin/bash
 set -e
 
-fnm install
+corepack enable
+
+fnm install || true
+nvm install || true
 
 dev-nginx setup-app dev-nginx.yaml