diff --git a/infra/postgresql17/docker-compose.yml b/infra/postgresql17/docker-compose.yml
index 053572b..87875f1 100644
--- a/infra/postgresql17/docker-compose.yml
+++ b/infra/postgresql17/docker-compose.yml
@@ -21,6 +21,13 @@ services:
     security_opt:
       - no-new-privileges:true
 
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U mailarchiver -d mailarchiver"]
+      interval: 30s
+      timeout: 5s
+      retries: 5
+      start_period: 30s
+
 networks:
   backend_net:
     external: true