diff --git a/scripts/deploy/github/build-images.sh b/scripts/deploy/github/build-images.sh
index ffa6db2e216..1b90d9e7bad 100755
--- a/scripts/deploy/github/build-images.sh
+++ b/scripts/deploy/github/build-images.sh
@@ -20,14 +20,31 @@ set -e
 
 REGISTRY="${REGISTRY:-kind-registry:5000}"
 TAG="${TAG:-latest}"
+EXIT_CODE=0
 
 docker system prune -a -f
 
-docker build -q -t "${REGISTRY}/apiserver:${TAG}" -f backend/Dockerfile . && docker push "${REGISTRY}/apiserver:${TAG}" &
-docker build -q -t "${REGISTRY}/persistenceagent:${TAG}" -f backend/Dockerfile.persistenceagent . && docker push "${REGISTRY}/persistenceagent:${TAG}" &
-docker build -q -t "${REGISTRY}/scheduledworkflow:${TAG}" -f backend/Dockerfile.scheduledworkflow . && docker push "${REGISTRY}/scheduledworkflow:${TAG}" &
+docker build -q -t "${REGISTRY}/apiserver:${TAG}" -f backend/Dockerfile . && docker push "${REGISTRY}/apiserver:${TAG}" || EXIT_CODE=$?
+if [[ $EXIT_CODE -ne 0 ]]
+then
+  echo "Failed to build apiserver image."
+  exit $EXIT_CODE
+fi
+
+docker build -q -t "${REGISTRY}/persistenceagent:${TAG}" -f backend/Dockerfile.persistenceagent . && docker push "${REGISTRY}/persistenceagent:${TAG}" || EXIT_CODE=$?
+if [[ $EXIT_CODE -ne 0 ]]
+then
+  echo "Failed to build persistenceagent image."
+  exit $EXIT_CODE
+fi
+
+docker build -q -t "${REGISTRY}/scheduledworkflow:${TAG}" -f backend/Dockerfile.scheduledworkflow . && docker push "${REGISTRY}/scheduledworkflow:${TAG}" || EXIT_CODE=$?
+if [[ $EXIT_CODE -ne 0 ]]
+then
+  echo "Failed to build scheduledworkflow image."
+  exit $EXIT_CODE
+fi
 
-wait
 
 # clean up intermittent build caches to free up disk space
 docker system prune -a -f