diff --git a/coreos-config/compose/01_keycloak/docker-compose.yaml b/coreos-config/compose/01_keycloak/docker-compose.yaml
index 109a158..6692458 100644
--- a/coreos-config/compose/01_keycloak/docker-compose.yaml
+++ b/coreos-config/compose/01_keycloak/docker-compose.yaml
@@ -15,12 +15,18 @@ services:
       - pg_data:/var/lib/postgresql/data
     networks:
       - backend
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
 
   keycloak:
     image: quay.io/keycloak/keycloak:19.0.0
     command: start
     depends_on:
-      - postgres
+      postgres:
+        condition: service_healthy
     environment:
       - "KC_DB=postgres"
       - "KC_DB_URL_HOST=postgres"
diff --git a/coreos-config/compose/02_gitea/docker-compose.yaml b/coreos-config/compose/02_gitea/docker-compose.yaml
index 5b253fa..a9dd42f 100644
--- a/coreos-config/compose/02_gitea/docker-compose.yaml
+++ b/coreos-config/compose/02_gitea/docker-compose.yaml
@@ -32,7 +32,8 @@ services:
     ports:
       - "7779:22"
     depends_on:
-      - db
+      db:
+        condition: service_healthy
 
   db:
     image: postgres:14
@@ -45,6 +46,11 @@ services:
       - backend
     volumes:
       - pg_data:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
 
   drone:
     image: drone/drone:2
diff --git a/coreos-config/compose/03_hedgedoc/docker-compose.yaml b/coreos-config/compose/03_hedgedoc/docker-compose.yaml
index 22be87c..c73af4a 100644
--- a/coreos-config/compose/03_hedgedoc/docker-compose.yaml
+++ b/coreos-config/compose/03_hedgedoc/docker-compose.yaml
@@ -12,6 +12,11 @@ services:
     restart: always
     networks:
       - backend
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
 
   app:
     # Make sure to use the latest release from https://hedgedoc.org/latest-release
@@ -48,7 +53,8 @@ services:
       - "traefik.http.services.hedgedoc.loadbalancer.server.port=3000"
       - "com.centurylinklabs.watchtower.scope=update"
     depends_on:
-      - database
+      database:
+        condition: service_healthy
     networks:
       - backend
       - gateway