diff --git a/.env b/.env
index ae9c379..b0b3339 100644
--- a/.env
+++ b/.env
@@ -3,3 +3,5 @@
 IMAGE_REPO=zammad/zammad-docker-compose
 VERSION=
 RESTART=always
+POSTGRES_USER=zammad
+POSTGRES_PASS=zammad
diff --git a/docker-compose.yml b/docker-compose.yml
index f0bb9ca..844ae72 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,8 +17,8 @@ services:
     environment:
       - BACKUP_SLEEP=86400
       - HOLD_DAYS=10
-      - POSTGRES_USER="zammad"
-      - POSTGRES_PASSWORD="zammad"
+      - POSTGRES_USER=${POSTGRES_USER}
+      - POSTGRES_PASSWORD=${POSTGRES_PASS}
 
   zammad-elasticsearch:
     image: ${IMAGE_REPO}:zammad-elasticsearch${VERSION}
@@ -65,8 +65,8 @@ services:
     volumes:
       - postgresql-data:/var/lib/postgresql/data
     environment:
-      - POSTGRES_USER="zammad"
-      - POSTGRES_PASSWORD="zammad"
+      - POSTGRES_USER=${POSTGRES_USER}
+      - POSTGRES_PASSWORD=${POSTGRES_PASS}
 
   zammad-railsserver:
     command: ["zammad-railsserver"]