diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 0a6b2ba..30517b5 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -10,10 +10,11 @@ services:
     volumes:
       - postgres-data:/var/lib/postgresql/data
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U ${SPRING_DATASOURCE_USERNAME} -d ${APP_DB_NAME:-condado}"]
+      test: ["CMD-SHELL", "pg_isready -h 127.0.0.1 -p 5432 -U postgres"]
       interval: 10s
       timeout: 5s
       retries: 10
+      start_period: 10s
 
   condado-newsletter:
     image: sancho41/condado-newsletter:latest