diff --git a/templates/docker-compose.yml.j2 b/templates/docker-compose.yml.j2
index 4d00ea9..e3dd36d 100644
--- a/templates/docker-compose.yml.j2
+++ b/templates/docker-compose.yml.j2
@@ -16,6 +16,7 @@ services:
       POSTGRES_USER: "nextcloud"
       POSTGRES_HOST: "database"
       NEXTCLOUD_TRUSTED_DOMAINS: "{{ inventory_hostname | default('ansible_undefined_fact') }}"
+    hostname: webserver
     networks:
       default:
         aliases:
@@ -28,6 +29,7 @@ services:
     restart: always
     env_file:
       - .db.env
+    hostname: database
     networks:
       default:
         aliases:
@@ -39,6 +41,7 @@ services:
       - 8080:8080
       - 4443:4443
     image: nginxproxy/nginx-proxy:1.9-alpine
+    hostname: nginxproxy
     environment:
       HTTP_PORT: 8080
       HTTPS_PORT: 4443