diff --git a/templates/docker-compose.yml.j2 b/templates/docker-compose.yml.j2
index c666e2f..895365c 100644
--- a/templates/docker-compose.yml.j2
+++ b/templates/docker-compose.yml.j2
@@ -4,6 +4,7 @@ services:
   db:
     # Note: Check the recommend version here: https://docs.nextcloud.com/server/latest/admin_manual/installation/system_requirements.html#server
     image: postgres:alpine
+    hostname: db
     restart: always
     volumes:
       - db:/var/lib/postgresql/data:Z
@@ -18,6 +19,7 @@ services:
 
   app:
     image: nextcloud:fpm-alpine
+    hostname: app
     restart: always
     volumes:
       - nextcloud:/var/www/html:z
@@ -36,6 +38,7 @@ services:
   # https://hub.docker.com/_/nginx/
   web:
     image: nginx:alpine-slim
+    hostname: web
     restart: always
     volumes:
       # https://docs.nextcloud.com/server/latest/admin_manual/installation/nginx.html
@@ -54,6 +57,8 @@ services:
 
   cron:
     image: nextcloud:fpm-alpine
+    hostname: cron
+    restart: always
     restart: always
     volumes:
       - nextcloud:/var/www/html:z
@@ -68,6 +73,7 @@ services:
   # https://hub.docker.com/r/nginxproxy/nginx-proxy
   proxy:
     build: ./proxy
+    hostname: proxy
     restart: always
     ports:
       - 8080:80