diff --git a/docker-compose.yml b/docker-compose.yml
index 4d8843a..e2017ab 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,11 +11,11 @@ services:
     environment:
       - FLASK_APP=app.py
       - FLASK_ENV=production
-      - DATABASE_URL=postgresql://postgres:postgres@db:5432/docupulse
+      - DATABASE_URL=postgresql://postgres:postgres@db:5432/docupulse_${PORT:-10335}
       - POSTGRES_USER=postgres
       - POSTGRES_PASSWORD=postgres
-      - POSTGRES_DB=docupulse
-      - MASTER=${ISMASTER:-fasle}
+      - POSTGRES_DB=docupulse_${PORT:-10335}
+      - MASTER=${ISMASTER:-false}
     volumes:
       - docupulse_uploads:/app/uploads
     depends_on:
@@ -41,7 +41,7 @@ services:
     environment:
       - POSTGRES_USER=postgres
       - POSTGRES_PASSWORD=postgres
-      - POSTGRES_DB=docupulse
+      - POSTGRES_DB=docupulse_${PORT:-10335}
     volumes:
       - docupulse_postgres_data:/var/lib/postgresql/data
     restart: unless-stopped