diff --git a/docker-compose.yml b/docker-compose.yml
index eb67657..e3379b4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,6 +19,8 @@ services:
   api:
     build: .
     container_name: wp_api
+    environment:
+      DATABASE_URL: ${DATABASE_URL}
     restart: unless-stopped
     depends_on:
       db:
@@ -29,14 +31,18 @@ services:
   db:
     image: postgres:16-alpine
     container_name: wp_db
+    environment:
+      POSTGRES_DB: ${POSTGRES_DB}
+      POSTGRES_USER: ${POSTGRES_USER}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
     volumes:
       - pgdata:/var/lib/postgresql/data
     restart: unless-stopped
-    # healthcheck:
-    #  test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
-    #  interval: 10s
-    #  timeout: 5s
-    #  retries: 5
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
     networks:
       - internal