diff --git a/docker-compose.local.yml b/docker-compose.local.yml
index 548ded1b1..4482e819d 100644
--- a/docker-compose.local.yml
+++ b/docker-compose.local.yml
@@ -44,9 +44,9 @@ services:
     ports:
       - '5432:5432'
     environment:
-      - POSTGRES_USER=postgres
-      - POSTGRES_PASSWORD=postgres
-      - POSTGRES_DB=simstudio
+      - POSTGRES_USER=${POSTGRES_USER:-postgres}
+      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-postgres}
+      - POSTGRES_DB=${POSTGRES_DB:-simstudio}
     volumes:
       - postgres_data:/var/lib/postgresql/data
     healthcheck:
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index b3ca277ed..dd68ec04b 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -41,9 +41,9 @@ services:
     ports:
       - '5432:5432'
     environment:
-      - POSTGRES_USER=postgres
-      - POSTGRES_PASSWORD=postgres
-      - POSTGRES_DB=simstudio
+      - POSTGRES_USER=${POSTGRES_USER:-postgres}
+      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-postgres}
+      - POSTGRES_DB=${POSTGRES_DB:-simstudio}
     volumes:
       - postgres_data:/var/lib/postgresql/data
     healthcheck: