diff --git a/podman-peerjs/zz_build-images.sh b/podman-peerjs/zz_build-images.sh
index fb30a20..8327406 100755
--- a/podman-peerjs/zz_build-images.sh
+++ b/podman-peerjs/zz_build-images.sh
@@ -12,13 +12,13 @@ buildfolder=/tmp/peerjs-server-$$
 if ! podman image exists ${upstream_images}:${version}; then
     mkdir ${buildfolder} &&
     curl -sSfL -- "https://github.com/peers/peerjs-server/archive/refs/tags/v${version}.tar.gz" | \tar xz --strip-components 1 -C ${buildfolder}/ &&
-    sed_in_place "^FROM node:alpine" "FROM docker.io/library/node:alpine" ${buildfolder}/Dockerfile
-    podman build -t ${upstream_images}:${version} ${buildfolder}/
-    podman rmi docker.io/library/node:alpine
-    rm -rf ${buildfolder}
-fi
+    sed_in_place "^FROM node:alpine" "FROM docker.io/library/node:alpine" ${buildfolder}/Dockerfile &&
+    podman build -t ${upstream_images}:${version} ${buildfolder}/ &&
+    podman rmi docker.io/library/node:alpine &&
+    rm -rf ${buildfolder} &&
+fi &&
 
 if ! skopeo inspect --format "ok" docker://${upstream_images}:${version}; then
-   podman login --username ${CONTAINER_REPO_USER} --password ${CONTAINER_REPO_PASSWORD} ${upstream_images%%/*}
+   podman login --username ${CONTAINER_REPO_USER} --password ${CONTAINER_REPO_PASSWORD} ${upstream_images%%/*} &&
    for i in $(seq 1 3); do podman push ${upstream_images}:${version} && s=0 && break || s=$? && sleep 1; done; (exit $s)
 fi