diff --git a/Makefile b/Makefile
index 0642649..38100e0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,4 @@
+SHELL := /bin/bash
 .PHONY: build build-web build-server build-tui run run-tui dev docker-up docker-down clean
 
 # Build everything
@@ -17,7 +18,7 @@ docs:
 
 # Build the web frontend
 build-web:
-	cd web && npm run build
+	cd web && [ -s ~/.nvm/nvm.sh ] && . ~/.nvm/nvm.sh && npm run build || (cd web && npm run build)
 
 # Run the server locally (dev mode)
 run: build-server
@@ -29,7 +30,7 @@ run-tui: build-tui
 
 # Run web dev server (in a separate terminal)
 dev-web:
-	cd web && npm run dev
+	cd web && [ -s ~/.nvm/nvm.sh ] && . ~/.nvm/nvm.sh && npm run dev || (cd web && npm run dev)
 
 # Start all backing services (no app, run that locally)
 docker-dev: