diff --git a/oneuptime/master/docker-compose.yml b/oneuptime/master/docker-compose.yml
index b455851..396f41a 100644
--- a/oneuptime/master/docker-compose.yml
+++ b/oneuptime/master/docker-compose.yml
@@ -11,9 +11,12 @@ services:
       - "${HOST_PORT_HTTPS:-4433}:443"
     environment:
       - TZ=${TIMEZONE:-Europe/Berlin}
-      # Reicht die Template-Strukturen an das Nginx-Skript durch
-      - NGINX_LISTEN_ADDRESS=${NGINX_LISTEN_ADDRESS}
-      - NGINX_LISTEN_OPTIONS=${NGINX_LISTEN_OPTIONS}
+      - NGINX_LISTEN_ADDRESS=${NGINX_LISTEN_ADDRESS:-0.0.0.0:}
+      - NGINX_LISTEN_OPTIONS=${NGINX_LISTEN_OPTIONS:-}
+      - SERVER_APP_HOSTNAME=${SERVER_APP_HOSTNAME:-app}
+      - APP_PORT=${APP_PORT:-80}
+      - SERVER_HOME_HOSTNAME=${SERVER_HOME_HOSTNAME:-home}
+      - HOME_PORT=${HOME_PORT:-1444}
     depends_on:
       - oneuptime
 
@@ -22,6 +25,10 @@ services:
     image: oneuptime/app:${ONEUPTIME_VERSION:-release}
     container_name: oneuptime-master
     restart: ${RESTART_POLICY:-always}
+    networks:
+      default:
+        aliases:
+          - ${SERVER_APP_HOSTNAME:-app}
     environment:
       - CONTAINER_NAME=oneuptime
       - PORT=80
@@ -29,9 +36,11 @@ services:
       - APP_NAME=${APP_NAME:-OneUptime}
       - TZ=${TIMEZONE:-Europe/Berlin}
       
-      # Routing-Parameter
+      # Routing-Parameter mit Fallbacks
       - HOST=${ONEUPTIME_HOST:-localhost:7080}
       - HTTP_PROTOCOL=${ONEUPTIME_PROTOCOL:-http}
+      - SERVER_APP_HOSTNAME=${SERVER_APP_HOSTNAME:-app}
+      - APP_PORT=${APP_PORT:-80}
       
       # PostgreSQL-Verbindungsmuster
       - DATABASE_HOST=oneuptime-postgres
@@ -104,7 +113,7 @@ services:
     restart: ${RESTART_POLICY:-always}
     environment:
       - TZ=${TIMEZONE:-Europe/Berlin}
-      - ONEUPTIME_URL=http://oneuptime:80
+      - ONEUPTIME_URL=http://${SERVER_APP_HOSTNAME:-app}:80
       - PROBE_ID=${PROBE_ID:-global-probe}
       - PROBE_KEY=${PROBE_KEY:-default-probe-key-12345!}
     depends_on: