diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 153f49a..8c06251 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -24,9 +24,9 @@ services:
       DB_CONNECTION: "pgsql"
       DB_HOST: "pgsql"
       DB_PORT: 5432
-      DB_DATABASE: "${DB_DATABASE}"
-      DB_USERNAME: "${DB_USERNAME}"
-      DB_PASSWORD: "${DB_PASSWORD}"
+      DB_DATABASE: "${DB_DATABASE:?DB_DATABASE is required}"
+      DB_USERNAME: "${DB_USERNAME:?DB_USERNAME is required}"
+      DB_PASSWORD: "${DB_PASSWORD:?DB_PASSWORD is required}"
       REDIS_HOST: "redis"
       REDIS_CLIENT: "predis"
       QUEUE_CONNECTION: "redis"
@@ -45,13 +45,14 @@ services:
     container_name: bemeal-pgsql
     restart: unless-stopped
     environment:
-      POSTGRES_DB: "${DB_DATABASE}"
-      POSTGRES_USER: "${DB_USERNAME}"
-      POSTGRES_PASSWORD: "${DB_PASSWORD}"
+      POSTGRES_DB: "${DB_DATABASE:?DB_DATABASE is required}"
+      POSTGRES_USER: "${DB_USERNAME:?DB_USERNAME is required}"
+      POSTGRES_PASSWORD: "${DB_PASSWORD:?DB_PASSWORD is required}"
     volumes:
       - pgsql-data:/var/lib/postgresql/data
     healthcheck:
-      test: [ "CMD-SHELL", "pg_isready -U ${DB_USERNAME} -d ${DB_DATABASE}" ]
+      test: [ "CMD-SHELL", "pg_isready -h 127.0.0.1 -p 5432" ]
+      start_period: 30s
       interval: 5s
       timeout: 5s
       retries: 10
@@ -82,9 +83,9 @@ services:
       DB_CONNECTION: "pgsql"
       DB_HOST: "pgsql"
       DB_PORT: 5432
-      DB_DATABASE: "${DB_DATABASE}"
-      DB_USERNAME: "${DB_USERNAME}"
-      DB_PASSWORD: "${DB_PASSWORD}"
+      DB_DATABASE: "${DB_DATABASE:?DB_DATABASE is required}"
+      DB_USERNAME: "${DB_USERNAME:?DB_USERNAME is required}"
+      DB_PASSWORD: "${DB_PASSWORD:?DB_PASSWORD is required}"
       REDIS_HOST: "redis"
       REDIS_CLIENT: "predis"
       QUEUE_CONNECTION: "redis"