diff --git a/podman-jitsi/zz_build-images.sh b/podman-jitsi/zz_build-images.sh
index 94bcd5a..34d5bf5 100755
--- a/podman-jitsi/zz_build-images.sh
+++ b/podman-jitsi/zz_build-images.sh
@@ -9,8 +9,7 @@ ensure_not_root
 
 buildfolder=/tmp/docker-jitsi-meet-$$
 
-mkdir ${buildfolder} &&
-curl -sSfL -- "https://github.com/jitsi/docker-jitsi-meet/archive/refs/tags/${version}.tar.gz" | tar xz --strip-components 1 -C ${buildfolder}/ && {
+build_base() {
     podman pull docker.io/library/debian:bullseye-slim
     if ! podman image exists localhost/jitsi/base:${version}; then
         podman build -t localhost/jitsi/base:${version} ${buildfolder}/base/ &&
@@ -20,19 +19,31 @@ curl -sSfL -- "https://github.com/jitsi/docker-jitsi-meet/archive/refs/tags/${ve
         podman build -t localhost/jitsi/base-java:${version} ${buildfolder}/base-java &&
         podman image tag localhost/jitsi/base-java:${version} localhost/jitsi/base-java:latest || exit -1
     fi
+    base_cleanup=true
+}
+
+mkdir ${buildfolder} &&
+curl -sSfL -- "https://github.com/jitsi/docker-jitsi-meet/archive/refs/tags/${version}.tar.gz" | tar xz --strip-components 1 -C ${buildfolder}/ && {
     if ! podman image exists localhost/jitsi/jvb:${version}; then
+	build_base
         podman build -t localhost/jitsi/jvb:${version} ${buildfolder}/jvb/ || exit -1
     fi
     if ! podman image exists localhost/jitsi/jicofo:${version}; then
+	build_base
         podman build -t localhost/jitsi/jicofo:${version} ${buildfolder}/jicofo/ || exit -1
     fi
     if ! podman image exists localhost/jitsi/prosody:${version}; then
+	build_base
         podman build -t localhost/jitsi/prosody:${version} ${buildfolder}/prosody/ || exit -1
     fi
     if ! podman image exists localhost/jitsi/web:${version}; then
+	build_base
         podman build -t localhost/jitsi/web:${version} ${buildfolder}/web/ || exit -1
-        podman rmi -f $(podman images -f "dangling=true" -q)
     fi
-    podman rmi localhost/jitsi/base-java:${version} localhost/jitsi/base-java:latest
-    podman rmi localhost/jitsi/base:${version} localhost/jitsi/base:latest
+    dangling_images=$(podman images -f "dangling=true" -q)
+    test ! -z ${dangling_images} && podman rmi -f "${dangling_images}"
+    if [ ! -z ${base_cleanup} ] ; then
+	podman rmi localhost/jitsi/base-java:${version} localhost/jitsi/base-java:latest
+	podman rmi localhost/jitsi/base:${version} localhost/jitsi/base:latest
+    fi
 } ; rm -rf ${buildfolder}