diff --git a/tools/install_python_dependencies.sh b/tools/install_python_dependencies.sh
index cdbaca32cf..c2db249cf2 100755
--- a/tools/install_python_dependencies.sh
+++ b/tools/install_python_dependencies.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -e
+set -euo pipefail
 
 # Increase the pip timeout to handle TimeoutError
 export PIP_DEFAULT_TIMEOUT=200
@@ -10,7 +10,7 @@ cd "$ROOT"
 
 if ! command -v "uv" > /dev/null 2>&1; then
   echo "installing uv..."
-  curl -LsSf https://astral.sh/uv/install.sh | sh
+  curl -LsSf --retry 5 --retry-delay 5 --retry-all-errors https://astral.sh/uv/install.sh | sh
   UV_BIN="$HOME/.local/bin"
   PATH="$UV_BIN:$PATH"
 fi
diff --git a/tools/setup.sh b/tools/setup.sh
index e0a9a4f6a6..fd7efcee90 100755
--- a/tools/setup.sh
+++ b/tools/setup.sh
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
-
-set -e
+set -euo pipefail
 
 RED='\033[0;31m'
 GREEN='\033[0;32m'