diff --git a/.env.default b/.env.default
index 531584cf..fc42e47d 100644
--- a/.env.default
+++ b/.env.default
@@ -1 +1,3 @@
-REDIS_PASSWORD=CHANGE_ME
\ No newline at end of file
+POSTGRES_USER=excalidraw-user
+POSTGRES_PASSWORD=
+POSTGRES_DB=excalidraw-dev
\ No newline at end of file
diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml
index b2623f4e..c6610a8e 100644
--- a/docker-compose-prod.yml
+++ b/docker-compose-prod.yml
@@ -23,7 +23,7 @@ services:
       - "5011:8080"
     restart: always
     environment:
-      STORAGE_URI: postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres:5432/${POSTGRES_DB}
+      STORAGE_URI: postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres:${POSTGRES_PORT:-5432}/${POSTGRES_DB:-excalidraw-prod}
 
   excalidraw-room:
     image: excalidraw/excalidraw-room
diff --git a/docker-compose.yml b/docker-compose.yml
index 83ae88c8..1d4ea89e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -26,7 +26,7 @@ services:
     ports:
       - "8080:8080"
     environment:
-      STORAGE_URI: postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres:5432/${POSTGRES_DB}
+      STORAGE_URI: postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres:${POSTGRES_PORT:-5432}/${POSTGRES_DB:-excalidraw-dev}
 
   excalidraw-room:
     image: excalidraw/excalidraw-room