diff --git a/podman-matrix/zz_build-images.sh b/podman-matrix/zz_build-images.sh
index fb037c7..3eee1ae 100755
--- a/podman-matrix/zz_build-images.sh
+++ b/podman-matrix/zz_build-images.sh
@@ -21,8 +21,8 @@ if ! podman image exists localhost/matrixdotorg/synapse:${synapse_version}; then
 		       --local dockerfile=${buildfolder}/docker/ \
 		       --output type=oci,name="fixme:synapse_${synapse_version}" | \
                        podman load &&
-        podman image tag localhost/synapse_${synapse_version}:latest ${synapse_image}:${synapse_version}
-        podman image rm localhost/synapse_${synapse_version}:latest
+        podman image tag localhost/synapse_${synapse_version}:latest ${synapse_image}:${synapse_version} &&
+        podman image rm localhost/synapse_${synapse_version}:latest &&
 	podman rm --force buildkitd &&
 	podman rmi docker.io/moby/buildkit:latest &&
 	rm -f ~/bin/buildctl