diff --git a/deploy/.env.example b/deploy/.env.example
index cd17ffb..597e070 100644
--- a/deploy/.env.example
+++ b/deploy/.env.example
@@ -1,14 +1,10 @@
-# Datenbank-Passwort (wird auch intern vom Backend genutzt)
-MORZ_DB_PASSWORD=sicheres-passwort-hier
+# PostgreSQL
+POSTGRES_PASSWORD=sicheres-passwort-hier
 
-# Initialer Admin-Benutzer (Tenant: MORZ_DEFAULT_TENANT)
-# Leer lassen = zufälliges Passwort wird generiert und ins Log geschrieben
-MORZ_ADMIN_PASSWORD=
-
-# Standard-Tenant-Slug
-MORZ_DEFAULT_TENANT=morz
-
-# MQTT-Broker – intern erreichbar über den mqtt-Service
-MORZ_MQTT_BROKER=tcp://mqtt:1883
-MORZ_MQTT_USERNAME=
-MORZ_MQTT_PASSWORD=
+# Backend
+MORZ_INFOBOARD_DATABASE_URL=postgres://morz_infoboard:sicheres-passwort-hier@db:5432/morz_infoboard?sslmode=disable
+MORZ_INFOBOARD_ADMIN_PASSWORD=
+MORZ_INFOBOARD_DEFAULT_TENANT=morz
+MORZ_INFOBOARD_MQTT_BROKER=tcp://mqtt:1883
+MORZ_INFOBOARD_MQTT_USERNAME=
+MORZ_INFOBOARD_MQTT_PASSWORD=
diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml
index 8064df1..31e89f3 100644
--- a/deploy/docker-compose.yml
+++ b/deploy/docker-compose.yml
@@ -4,16 +4,12 @@ services:
     restart: unless-stopped
     ports:
       - "127.0.0.1:8080:8080"
+    env_file:
+      - .env
     environment:
       MORZ_INFOBOARD_HTTP_ADDR: ":8080"
-      MORZ_INFOBOARD_DATABASE_URL: "postgres://morz_infoboard:${MORZ_DB_PASSWORD}@db:5432/morz_infoboard?sslmode=disable"
       MORZ_INFOBOARD_UPLOAD_DIR: /app/uploads
       MORZ_INFOBOARD_STATUS_STORE_PATH: /app/data/status
-      MORZ_INFOBOARD_MQTT_BROKER: "${MORZ_MQTT_BROKER}"
-      MORZ_INFOBOARD_MQTT_USERNAME: "${MORZ_MQTT_USERNAME}"
-      MORZ_INFOBOARD_MQTT_PASSWORD: "${MORZ_MQTT_PASSWORD}"
-      MORZ_INFOBOARD_ADMIN_PASSWORD: "${MORZ_ADMIN_PASSWORD}"
-      MORZ_INFOBOARD_DEFAULT_TENANT: "${MORZ_DEFAULT_TENANT:-morz}"
       MORZ_INFOBOARD_DEV_MODE: "false"
       TZ: "Europe/Berlin"
     volumes:
@@ -29,9 +25,10 @@ services:
   db:
     image: postgres:17-alpine
     restart: unless-stopped
+    env_file:
+      - .env
     environment:
       POSTGRES_USER: morz_infoboard
-      POSTGRES_PASSWORD: "${MORZ_DB_PASSWORD}"
       POSTGRES_DB: morz_infoboard
     volumes:
       - db_data:/var/lib/postgresql/data