diff --git a/docker-compose.yml b/docker-compose.yml
index 6c58fec..7528b4f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -15,8 +15,10 @@ services:
 
   db:
     image: postgres:13
-    env_file:
-      - stack.env
+    environment:
+      - POSTGRES_USER=postgres
+      - POSTGRES_PASSWORD=1253
+      - POSTGRES_DB=docupulse
     volumes:
       - postgres_data:/var/lib/postgresql/data
     healthcheck:
diff --git a/entrypoint.sh b/entrypoint.sh
index dcebb41..f1ba3cc 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -9,7 +9,7 @@ echo "Database is ready!"
 
 # Wait for PostgreSQL to be ready to accept connections
 echo "Waiting for PostgreSQL to accept connections..."
-until PGPASSWORD=1253 psql -h db -U postgres -d docupulse -c '\q'; do
+until PGPASSWORD=$POSTGRES_PASSWORD psql -h db -U $POSTGRES_USER -d $POSTGRES_DB -c '\q'; do
   echo "PostgreSQL is unavailable - sleeping"
   sleep 1
 done