diff --git a/scripts/e2e.sh b/scripts/e2e.sh
index d361ae34..149d76f9 100755
--- a/scripts/e2e.sh
+++ b/scripts/e2e.sh
@@ -17,7 +17,7 @@ mkdir -p logs
 cd frontend
 npm run build
 
-../scripts/wait-for-server.sh
+../scripts/utils/wait-for-server.sh
 
 pids=()
 for i in $(seq 1 $process_count); do
diff --git a/scripts/update-api-types.sh b/scripts/update-api-types.sh
index 0827f9a8..d9f39566 100755
--- a/scripts/update-api-types.sh
+++ b/scripts/update-api-types.sh
@@ -1,4 +1,8 @@
 #!/bin/bash
 
+set -e
+
+./scripts/utils/wait-for-server.sh
+
 npm install -g openapi-typescript
 openapi-typescript http://localhost:3000/api.json --output frontend/sync-client/src/services/types.ts
diff --git a/scripts/wait-for-server.sh b/scripts/utils/wait-for-server.sh
similarity index 98%
rename from scripts/wait-for-server.sh
rename to scripts/utils/wait-for-server.sh
index fa7f02bd..7824c405 100755
--- a/scripts/wait-for-server.sh
+++ b/scripts/utils/wait-for-server.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 SERVER_URL="http://localhost:3000"
 MAX_RETRIES=30
 RETRY_INTERVAL_IN_SECONDS=5