diff --git a/podman-matrix/.gitlab-ci.yml b/podman-matrix/.gitlab-ci.yml
index 1d66764..202ba77 100644
--- a/podman-matrix/.gitlab-ci.yml
+++ b/podman-matrix/.gitlab-ci.yml
@@ -1,6 +1,7 @@
 before_script:
   - podman pod exists podman-matrix && podman pod rm --force podman-matrix
   - podman container exists synapse-generate && podman container rm --force synapse-generate
+  - podman container exists buildkitd && podman container rm --force buildkitd
   - rm -f ~/.config/systemd/user/pod-podman-matrix.service && systemctl --user daemon-reload
   - podman volume exists matrixdotorg_synapse-data && podman volume rm matrixdotorg_synapse-data
   - podman volume exists matrixdotorg_synapse-pgsql && podman volume rm matrixdotorg_synapse-pgsql
diff --git a/podman-matrix/05_freshinstall.sh b/podman-matrix/05_freshinstall.sh
index d600749..ab15f55 100755
--- a/podman-matrix/05_freshinstall.sh
+++ b/podman-matrix/05_freshinstall.sh
@@ -16,6 +16,7 @@ if podman volume exists ${confvolume} || podman volume exists ${dbvolume}; then
 fi
 
 source ${ABSDIR}/zz_build-images.sh &&
+podman image exists ${synapse_image}:${synapse_version} &&
 podman volume create ${confvolume} && \
 podman volume create ${dbvolume} && \
 podman run -it --name ${container_name}-generate --mount type=volume,src=${confvolume},dst=/data -e SYNAPSE_SERVER_NAME=${GARBAYE_MATRIX_DOMAIN} -e SYNAPSE_REPORT_STATS=no ${synapse_image}:${synapse_version} generate && \