diff --git a/templates/compose/sparkyfitness.yaml b/templates/compose/sparkyfitness.yaml
index ebba66f2f..5bf4e0b67 100644
--- a/templates/compose/sparkyfitness.yaml
+++ b/templates/compose/sparkyfitness.yaml
@@ -48,6 +48,11 @@ services:
       POSTGRES_DB: '${SPARKY_FITNESS_DB_NAME:-sparkyfitness}'
       POSTGRES_USER: '${SERVICE_USER_POSTGRES}'
       POSTGRES_PASSWORD: '${SERVICE_PASSWORD_POSTGRES}'
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
+      interval: 5s
+      timeout: 20s
+      retries: 10
     volumes:
       - 'sparkyfitness-db-postgresql:/var/lib/postgresql/data'