diff --git a/podman-matrix/.gitlab-ci.yml b/podman-matrix/.gitlab-ci.yml
index 5fb909d..1d66764 100644
--- a/podman-matrix/.gitlab-ci.yml
+++ b/podman-matrix/.gitlab-ci.yml
@@ -1,5 +1,6 @@
 before_script:
-  - podman pod exists podman-matrix ; podman pod rm --force podman-matrix ; podman container rm --force synapse-generate
+  - podman pod exists podman-matrix && podman pod rm --force podman-matrix
+  - podman container exists synapse-generate && podman container rm --force synapse-generate
   - 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