diff --git a/templates/docker-compose.yml.j2 b/templates/docker-compose.yml.j2
index 8377723..3015d5a 100644
--- a/templates/docker-compose.yml.j2
+++ b/templates/docker-compose.yml.j2
@@ -14,6 +14,7 @@ services:
       VIRTUAL_HOST: "{{ inventory_hostname | default('ansible_undefined_fact') }}"
       VIRTUAL_ROOT: "/var/www/html/"
       LETSENCRYPT_HOST: "{{ inventory_hostname | default('ansible_undefined_fact') }}"
+      NEXTCLOUD_ADMIN_USER: "admin"
       POSTGRES_DB: "nextcloud"
       POSTGRES_USER: "postgres"
       POSTGRES_HOST: "database"
@@ -29,9 +30,11 @@ services:
   database:
     image: postgres:latest
     restart: always
+    hostname: database
     env_file:
       - .db.env
-    hostname: database
+   environment:
+     POSTGRES_DB: "nextcloud"
     networks:
       default:
         aliases: