diff --git a/templates/docker-compose.yml.j2 b/templates/docker-compose.yml.j2
index e589281..a93b920 100644
--- a/templates/docker-compose.yml.j2
+++ b/templates/docker-compose.yml.j2
@@ -3,13 +3,13 @@ services:
   db:
     image: postgres:alpine
     restart: always
-    hostname: database
+    hostname: db
     environment:
       POSTGRES_DB: "nextcloud"
     volumes:
       - db:/var/lib/postgresql/data:Z
     env_file:
-      - db.env
+      - .db.env
 
   redis:
     image: redis:alpine
@@ -27,16 +27,14 @@ services:
       NEXTCLOUD_ADMIN_USER: "admin"
       POSTGRES_DB: "nextcloud"
       POSTGRES_USER: "postgres"
-      POSTGRES_HOST: "database"
+      POSTGRES_HOST: "db"
+      REDIS_HOST: "redis"
       NEXTCLOUD_TRUSTED_DOMAINS: "{{ inventory_hostname | default('ansible_undefined_fact') }}"
     volumes:
       - ~/webroot:/var/www/html
       # NOTE: The `volumes` config of the `cron` and `app` containers must match
-    environment:
-      - POSTGRES_HOST=db
-      - REDIS_HOST=redis
     env_file:
-      - db.env
+      - .webserver.env
     depends_on:
       - db
       - redis