diff --git a/scripts/start-containers.sh b/scripts/start-containers.sh
index 1df64fe..00f62e3 100755
--- a/scripts/start-containers.sh
+++ b/scripts/start-containers.sh
@@ -16,17 +16,9 @@ require_job_env BUILDER_POD_STARTUP_TIMEOUT
 set -x
 stx control stop
 stx config --upgrade
-stx control start
+### There is a timeout of 5 minutes on the --wait parameter 
+stx control start --wait
 
-# wait for startup
-notice "waiting for containers to startup ($BUILDER_POD_STARTUP_TIMEOUT seconds)"
-let deadline="$(date '+%s')+$BUILDER_POD_STARTUP_TIMEOUT"
-until check_all_pods_running ; do
-    if [[ "$(date '+%s')" -ge $deadline ]] ; then
-        die "pods didn't start up after $BUILDER_POD_STARTUP_TIMEOUT second(s)"
-    fi
-    sleep 10
-done
 stx control status
 
 # Add ssh access key to signing server