diff --git a/cce/modules/exporter-compose.yml b/cce/modules/exporter-compose.yml
index 2945bad..4d0ac5d 100644
--- a/cce/modules/exporter-compose.yml
+++ b/cce/modules/exporter-compose.yml
@@ -38,6 +38,9 @@ services:
 
     volumes:
       - "/var/cache/bridgehead/cce/exporter-files:/app/exporter-files/output"
+    depends_on:
+      exporter-db:
+        condition: service_healthy
 
   exporter-db:
     image: docker.verbis.dkfz.de/cache/postgres:${POSTGRES_TAG}
@@ -49,6 +52,12 @@ services:
     volumes:
       # Consider removing this volume once we find a solution to save Lens-queries to be executed in the explorer.
       - "/var/cache/bridgehead/cce/exporter-db:/var/lib/postgresql/data"
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U exporter -d exporter"]
+      interval: 5s
+      timeout: 5s
+      retries: 20
+      start_period: 10s
 
   reporter:
     image: docker.verbis.dkfz.de/ccp/dktk-reporter:latest
diff --git a/cce/modules/project-manager-compose.yml b/cce/modules/project-manager-compose.yml
index e69a124..bf49dde 100644
--- a/cce/modules/project-manager-compose.yml
+++ b/cce/modules/project-manager-compose.yml
@@ -79,10 +79,11 @@ services:
     volumes:
       - "/var/cache/bridgehead/cce/project-manager-db:/var/lib/postgresql/data"
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U project_manager"]
+      test: ["CMD-SHELL", "pg_isready -U project_manager -d project_manager"]
       interval: 5s
       timeout: 5s
-      retries: 5
+      retries: 20
+      start_period: 10s
     deploy:
       resources:
         limits: