diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7b2ab882..a9d06e2f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,6 +7,8 @@ build-and-benchmark:
   script:
     - podman build . -f Dockerfile -t rebenchdb-app
     - podman build . -f Dockerfile.rebench -t bench-rdb
-    - ~/.local/bin/podman-compose -f ./docker-compose.yml -f ./docker-compose.rebench.yml up --build --abort-on-container-exit --exit-code-from rebenchdb-app
+    - ~/.local/bin/podman-compose -f ./docker-compose.yml -f ./docker-compose.rebench.yml up --build -d | tee compose.log
+    # Hack to wait for the end of the benchmarks
+    - grep -q "------------------------------------------------------------------------------------------------" <(tail -f compose.log)
   after_script:
     - ~/.local/bin/podman-compose down