diff --git a/podman-matrix/zz_build-images.sh b/podman-matrix/zz_build-images.sh
new file mode 100755
index 0000000..f56befa
--- /dev/null
+++ b/podman-matrix/zz_build-images.sh
@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+
+ABSDIR="$( dirname "$(readlink -f -- "$0")" )"
+source ${ABSDIR}/../functions.sh
+source ${ABSDIR}/vars.sh
+
+ensure_pwd_is_scriptdir
+ensure_not_root
+
+if ! podman image exists localhost/matrixdotorg/synapse:${synapse_version}; then
+    mkdir synapse &&
+    curl -s -- "https://codeload.github.com/matrix-org/synapse/tar.gz/refs/tags/${synapse_version}" | tar xz --strip-components 1 -C synapse/ && {
+	podman pull docker.io/python:3.9-slim && 
+	podman pull docker.io/moby/buildkit:latest &&
+	podman run -d --name buildkitd --privileged docker.io/moby/buildkit:latest &&
+	curl -sSLf https://github.com/moby/buildkit/releases/download/v0.9.3/buildkit-v0.9.3.linux-amd64.tar.gz | tar xz -C ~/ bin/buildctl &&
+        ~/bin/buildctl --addr=podman-container://buildkitd build --frontend dockerfile.v0 --local context=synapse/ --local dockerfile=synapse/docker/ --output type=tar | podman import - localhost/matrixdotorg/synapse:${synapse_version}
+	podman rm --force buildkitd &&
+	podman rmi docker.io/moby/buildkit:latest &&
+	rm -f bin/buildctl
+    }
+    rm -rf synapse
+fi