diff --git a/push-image.sh b/push-image.sh
index 8ea12d1..2c9079d 100755
--- a/push-image.sh
+++ b/push-image.sh
@@ -1,24 +1,20 @@
 #!/usr/bin/env bash
-set -e
+set -euo pipefail
 
 REGISTRY="gitea.gofwd.group"
 OWNER="forward_group/ballistic-builder-spring"
 IMAGE="spring-api"
 
-TAG=$(git rev-parse --short HEAD)
-
+TAG="$(git rev-parse --short HEAD)"
 FULL_IMAGE="$REGISTRY/$OWNER/$IMAGE"
 
-echo "Building $FULL_IMAGE:$TAG"
-docker buildx build -f docker/backend/Dockerfile --platform linux/amd64,linux/arm64 --push  -t $FULL_IMAGE:$TAG .
+echo "Building & pushing multi-arch: $FULL_IMAGE:$TAG and :latest"
+docker buildx build \
+  -f docker/backend/Dockerfile \
+  --platform linux/amd64,linux/arm64 \
+  -t "$FULL_IMAGE:$TAG" \
+  -t "$FULL_IMAGE:latest" \
+  --push \
+  .
 
-echo "Tagging latest"
-docker tag $FULL_IMAGE:$TAG $FULL_IMAGE:latest
-
-echo "Pushing $TAG"
-docker push $FULL_IMAGE:$TAG
-
-echo "Pushing latest"
-docker push $FULL_IMAGE:latest
-
-echo "Done!"
+echo "Done."