diff --git a/oneuptime/master/docker-compose.yml b/oneuptime/master/docker-compose.yml
index 396f41a..44d33e0 100644
--- a/oneuptime/master/docker-compose.yml
+++ b/oneuptime/master/docker-compose.yml
@@ -14,7 +14,7 @@ services:
       - 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}
+      - APP_PORT=${APP_PORT:-3002} # KORREKTUR: Nginx sucht standardmäßig auf Port 3002
       - SERVER_HOME_HOSTNAME=${SERVER_HOME_HOSTNAME:-home}
       - HOME_PORT=${HOME_PORT:-1444}
     depends_on:
@@ -31,16 +31,16 @@ services:
           - ${SERVER_APP_HOSTNAME:-app}
     environment:
       - CONTAINER_NAME=oneuptime
-      - PORT=80
+      - PORT=3002 # KORREKTUR: App horcht nun auf Port 3002 für das Nginx-Gateway
       - ENCRYPTION_SECRET=${ENCRYPTION_SECRET:-ein_sehr_sicheres_zufaelliges_passwort_123!}
       - APP_NAME=${APP_NAME:-OneUptime}
       - TZ=${TIMEZONE:-Europe/Berlin}
       
-      # Routing-Parameter mit Fallbacks
+      # Routing-Parameter (Port 7080 muss für Links im Browser gemeldet werden)
       - HOST=${ONEUPTIME_HOST:-localhost:7080}
       - HTTP_PROTOCOL=${ONEUPTIME_PROTOCOL:-http}
       - SERVER_APP_HOSTNAME=${SERVER_APP_HOSTNAME:-app}
-      - APP_PORT=${APP_PORT:-80}
+      - APP_PORT=${APP_PORT:-3002}
       
       # PostgreSQL-Verbindungsmuster
       - DATABASE_HOST=oneuptime-postgres
@@ -92,6 +92,7 @@ services:
 
   # 5. ClickHouse: Analysedatenbank für Log-Daten und Metriken
   oneuptime-clickhouse:
+    image: clickhouse/house-server:${CLICKHOUSE_VERSION:-latest}
     image: clickhouse/clickhouse-server:${CLICKHOUSE_VERSION:-latest}
     container_name: oneuptime-clickhouse
     restart: ${RESTART_POLICY:-always}
@@ -113,7 +114,7 @@ services:
     restart: ${RESTART_POLICY:-always}
     environment:
       - TZ=${TIMEZONE:-Europe/Berlin}
-      - ONEUPTIME_URL=http://${SERVER_APP_HOSTNAME:-app}:80
+      - ONEUPTIME_URL=http://${SERVER_APP_HOSTNAME:-app}:3002
       - PROBE_ID=${PROBE_ID:-global-probe}
       - PROBE_KEY=${PROBE_KEY:-default-probe-key-12345!}
     depends_on: