diff --git a/scripts/run-e2e.sh b/scripts/run-e2e.sh
index 1f05d39..0a4a439 100755
--- a/scripts/run-e2e.sh
+++ b/scripts/run-e2e.sh
@@ -3,9 +3,9 @@ set -e
 
 # Usage: ./run-e2e.sh [--docker] [--ui]
 
-NODE_BIN=$(command -v bun || command -v npm)
+NODE_BIN=$(command -v bun || command -v npm || true)
 # Use podman if available. Not everyone has it
-CONTAINER_BIN=$(command -v podman || command -v docker)
+CONTAINER_BIN=$(command -v podman || command -v docker || true)
 COMPOSE_BIN=$(command -v docker-compose)
 if [ -z "$CONTAINER_BIN" ]; then
     echo "Sorry, you need either podman or docker installed to run this script."
@@ -13,7 +13,7 @@ if [ -z "$CONTAINER_BIN" ]; then
 fi
 
 if [ "$CI" = "true" ]; then
-    CONTAINER_BIN=$(command -v docker)
+    CONTAINER_BIN=$(command -v docker || true)
 fi
 
 echo "Using $CONTAINER_BIN for container operations..."
@@ -63,7 +63,7 @@ mkdir -p ./tmp/logs
 )
 (
     cd backend
-    uv run manage.py serve
+    exec uv run manage.py serve
 ) > ./tmp/logs/backend.log 2>&1 &
 BACKEND_PID=$!
 
diff --git a/scripts/setup.sh b/scripts/setup.sh
index 3ffd5a0..7686179 100755
--- a/scripts/setup.sh
+++ b/scripts/setup.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 set -e
 
-NODE_BIN=$(command -v bun || command -v npm)
-PY_BIN=$(command -v uv || command -v pip)
-DISTRO_BIN=$(command -v apt || command -v yum || command -v pacman || command -v zypper)
+NODE_BIN=$(command -v bun || command -v npm || true)
+PY_BIN=$(command -v uv || command -v pip || true)
+DISTRO_BIN=$(command -v apt || command -v yum || command -v pacman || command -v zypper || true)
 
 echo "[Backend] Installing Backend Packages..."
 if [ $(basename "$PY_BIN") = "pip" ]; then