diff --git a/docker-compose.yml b/docker-compose.yml
index b6ac982d..e9c55d50 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -27,7 +27,7 @@ services:
         ]
       interval: 5s
       timeout: 1s
-      retries: 30
+      retries: 3
       start_period: 30s # Failures in 30 seconds do not mark container as unhealthy
 
   migrate:
diff --git a/justfile b/justfile
index 18fe6a40..39320f15 100644
--- a/justfile
+++ b/justfile
@@ -130,6 +130,10 @@ build: copy-proto
 # # ---------------------------------------------------------------------------- #
 # Start the default docker compose containers
 services:
+    # HACK: The loading of pg_stat_statements plugin leads to a restart of the DB container.
+    #   This makes the health test immediately fail. The trick below is a workaround for this.
+    docker compose --env-file ./ci/config/env.list up -d --wait --wait-timeout 120 || true
+    sleep 5
     docker compose --env-file ./ci/config/env.list up -d --wait --wait-timeout 120