diff --git a/docker/docker-compose.ci.yml b/docker/docker-compose.ci.yml
index b8358950ea..71020db5b5 100644
--- a/docker/docker-compose.ci.yml
+++ b/docker/docker-compose.ci.yml
@@ -34,6 +34,11 @@ services:
       POSTGRES_DB: dso-console-db
       POSTGRES_USER: admin
       POSTGRES_PASSWORD: admin
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U admin -d dso-console-db"]
+      interval: 5s
+      timeout: 5s
+      retries: 10
     networks:
       - dso-network
     attach: false
@@ -49,7 +54,7 @@ services:
     user: root
     depends_on:
       postgres:
-        condition: service_started
+        condition: service_healthy
       keycloak:
         condition: service_healthy
     volumes:
@@ -73,7 +78,7 @@ services:
     container_name: dso-console_server-nestjs
     depends_on:
       postgres:
-        condition: service_started
+        condition: service_healthy
       keycloak:
         condition: service_healthy
       opencds-mockoon:
diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml
index 98f2a31933..89641dc79f 100644
--- a/docker/docker-compose.dev.yml
+++ b/docker/docker-compose.dev.yml
@@ -32,6 +32,11 @@ services:
       POSTGRES_DB: dso-console-db
       POSTGRES_USER: admin
       POSTGRES_PASSWORD: admin
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U admin -d dso-console-db"]
+      interval: 5s
+      timeout: 5s
+      retries: 10
     ports:
       - 5432:5432
     volumes:
@@ -71,7 +76,7 @@ services:
       keycloak:
         condition: service_healthy
       postgres:
-        condition: service_started
+        condition: service_healthy
     ports:
       - 4001:8080
       - 9229:9229
@@ -123,7 +128,7 @@ services:
       keycloak:
         condition: service_healthy
       postgres:
-        condition: service_started
+        condition: service_healthy
       opencds-mockoon:
         condition: service_healthy
     env_file:
diff --git a/docker/docker-compose.integ.yml b/docker/docker-compose.integ.yml
index 385f5e85e7..e50217bbf5 100644
--- a/docker/docker-compose.integ.yml
+++ b/docker/docker-compose.integ.yml
@@ -7,6 +7,11 @@ services:
       POSTGRES_DB: dso-console-db
       POSTGRES_USER: admin
       POSTGRES_PASSWORD: admin
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U admin -d dso-console-db"]
+      interval: 5s
+      timeout: 5s
+      retries: 10
     ports:
       - 5432:5432
     volumes:
@@ -45,7 +50,7 @@ services:
     command: [dev]
     depends_on:
       postgres:
-        condition: service_started
+        condition: service_healthy
     ports:
       - 4001:8080
       - 9229:9229
@@ -97,7 +102,7 @@ services:
     command: [start:dev]
     depends_on:
       postgres:
-        condition: service_started
+        condition: service_healthy
       opencds-mockoon:
         condition: service_healthy
     ports:
diff --git a/docker/docker-compose.local.yml b/docker/docker-compose.local.yml
index 80473f1823..e3f42d4725 100644
--- a/docker/docker-compose.local.yml
+++ b/docker/docker-compose.local.yml
@@ -56,6 +56,11 @@ services:
       POSTGRES_DB: dso-console-db
       POSTGRES_USER: admin
       POSTGRES_PASSWORD: admin
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U admin -d dso-console-db"]
+      interval: 5s
+      timeout: 5s
+      retries: 10
     ports:
       - 5432:5432
     volumes: