diff --git a/roles/docker-openproject/templates/env.j2 b/roles/docker-openproject/templates/env.j2
index 160e1adc..699330f2 100644
--- a/roles/docker-openproject/templates/env.j2
+++ b/roles/docker-openproject/templates/env.j2
@@ -12,7 +12,8 @@ OPENPROJECT_HOST__NAME={{domain}}
 PORT=127.0.0.1:{{http_port}}
 OPENPROJECT_RAILS__RELATIVE__URL__ROOT=
 IMAP_ENABLED=false
-DATABASE_URL=postgres://openproject:{{ openproject_database_password }}@db/openproject?pool=20&encoding=unicode&reconnect=true
+POSTGRES_PASSWORD="{{ openproject_database_password }}"
+DATABASE_URL="postgres://postgres:{{ openproject_database_password }}@db/openproject?pool=20&encoding=unicode&reconnect=true"
 RAILS_MIN_THREADS=4
 RAILS_MAX_THREADS=16