diff --git a/podman-matrix/ci_build-images.sh b/podman-matrix/ci_build-images.sh
index bfad384..b13d03c 100755
--- a/podman-matrix/ci_build-images.sh
+++ b/podman-matrix/ci_build-images.sh
@@ -26,10 +26,12 @@ if ! podman image exists ${synapse_image}:${synapse_version}; then
                        podman image load &&
 	podman container rm --force buildkitd &&
 	podman image rm docker.io/moby/buildkit:${buildkitd_version}
-    }
+    } || retval=false
     rm -rf ${buildfolder}
+    eval $retval
 else
     echo "Image ${synapse_image}:${synapse_version} already built"
+    false
 fi &&
 
 oci_push_to_registry ${synapse_image}:${synapse_version}