diff --git a/docker-compose.yml b/docker-compose.yml
index e4c695e..f8af338 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,10 +18,10 @@ services:
   vikunja:
     image: vikunja/vikunja:0.24.6@sha256:ed1f3ed467fecec0b57e9de7bc6607f8bbcbb23ffced6a81f5dfefc794cdbe3b
     environment:
-      VIKUNJA_DATABASE_HOST: db
-      VIKUNJA_DATABASE_PASSWORD: ${DC_VIKUNJA_POSTGRES_PASSWORD:?}
       VIKUNJA_DATABASE_TYPE: postgres
-      VIKUNJA_DATABASE_USER: postgres
+      VIKUNJA_DATABASE_HOST: ${DC_VIKUNJA_POSTGRES_HOST:-db}
+      VIKUNJA_DATABASE_USER: ${DC_VIKUNJA_POSTGRES_USER:-postgres}
+      VIKUNJA_DATABASE_PASSWORD: ${DC_VIKUNJA_POSTGRES_PASSWORD:?}
       VIKUNJA_DATABASE_DATABASE: ${DC_VIKUNJA_POSTGRES_DB:-db}
       VIKUNJA_SERVICE_PUBLICURL: https://${DC_VIKUNJA_HOSTNAME:?}
       VIKUNJA_SERVICE_JWTSECRET: ${DC_VIKUNJA_JWTSECRET:?}