diff --git a/templates/docker-compose.yml.j2 b/templates/docker-compose.yml.j2
index b85581c..42ebccc 100644
--- a/templates/docker-compose.yml.j2
+++ b/templates/docker-compose.yml.j2
@@ -13,8 +13,8 @@ services:
       VIRTUAL_ROOT: "/var/www/html/"
       LETSENCRYPT_HOST: "{{ inventory_hostname | default('ansible_undefined_fact') }}"
       POSTGRES_DATABASE=nextclouddb
-      POSTGRES_USER=nextcloud
-      POSTGRES_HOST=localhost:5432
+      POSTGRES_USER="nextcloud"
+      POSTGRES_HOST="nextcloud-db.lan:5432"
       NEXTCLOUD_TRUSTED_DOMAINS="{{ inventory_hostname | default('ansible_undefined_fact') }}"
     networks:
       default:
@@ -23,6 +23,14 @@ services:
     volumes:
         - ~/webroot:/var/www/html
 
+  database:
+    image: postgres:latest
+    restart: always
+    networks:
+      default:
+        aliases:
+          "nextcloud-db.lan"
+
   nginx-proxy:
     restart: unless-stopped
     ports: