diff --git a/templates/db.env.j2 b/templates/db.env.j2
index c918ac9..45f321a 100644
--- a/templates/db.env.j2
+++ b/templates/db.env.j2
@@ -1,4 +1,3 @@
-POSTGRES_USER="nextcloud"
 POSTGRES_PASSWORD=
 NEXTCLOUD_ADMIN_USER="admin"
 NEXTCLOUD_ADMIN_PASSWORD=
diff --git a/templates/docker-compose.yml.j2 b/templates/docker-compose.yml.j2
index 120d0ba..aa5e135 100644
--- a/templates/docker-compose.yml.j2
+++ b/templates/docker-compose.yml.j2
@@ -26,9 +26,10 @@ services:
     volumes:
       - /home/{{ user.name }}/webroot:/var/www/html
     environment:
-      - POSTGRES_DB=nextcloud
-      - POSTGRES_HOST=db:5432
       - REDIS_HOST=redis
+      - POSTGRES_HOST=db:5432
+      - POSTGRES_DB=nextcloud
+      - POSTGRES_USER=postgres
       - NEXTCLOUD_ADMIN_USER=admin
       - NEXTCLOUD_TRUSTED_DOMAINS={{ inventory_hostname | default('ansible_undefined_variable')}}
     env_file: