diff --git a/apps/tandoor/docker-compose.yml b/apps/tandoor/docker-compose.yml
index d1a6b362..9a611433 100644
--- a/apps/tandoor/docker-compose.yml
+++ b/apps/tandoor/docker-compose.yml
@@ -60,3 +60,9 @@ services:
     restart: unless-stopped
     networks:
       - tipi_main_network
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready", "-d", "tandoor"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 30s