diff --git a/docker-compose.yaml b/docker-compose.yaml
index c93d77c..e31b21e 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,5 +1,12 @@
 version: "3.9"
 
+x-environment: &default-env
+  MQTT_BROKER: "172.23.1.102"
+  MQTT_PORT: 1883
+  REDIS_HOST: "172.23.1.116"
+  REDIS_PORT: 6379
+  REDIS_DB: 8
+
 services:
 
   ui:
@@ -22,12 +29,8 @@ services:
       dockerfile: apps/api/Dockerfile
     container_name: api
     environment:
-      MQTT_BROKER: ${MQTT_BROKER}
-      MQTT_PORT: ${MQTT_PORT}
-      REDIS_HOST: ${REDIS_HOST}
-      REDIS_PORT: ${REDIS_PORT}
-      REDIS_DB: ${REDIS_DB}
-      REDIS_CHANNEL: ${REDIS_CHANNEL}
+      <<: *default-env
+      REDIS_CHANNEL: "ui:updates"
     volumes:
       - ./config:/app/config:ro
     ports:
@@ -41,21 +44,6 @@ services:
       dockerfile: apps/abstraction/Dockerfile
     container_name: abstraction
     environment:
-      MQTT_BROKER: ${MQTT_BROKER}
-      MQTT_PORT: ${MQTT_PORT}
-      REDIS_HOST: ${REDIS_HOST}
-      REDIS_PORT: ${REDIS_PORT}
-      REDIS_DB: ${REDIS_DB}
+      <<: *default-env
     volumes:
       - ./config:/app/config:ro
-
-# gemeinsame Variablen → hier eintragen
-# (kannst du auch in eine .env-Datei legen)
-environment:
-  MQTT_BROKER: "172.23.1.102"
-  MQTT_PORT: 1883
-  REDIS_HOST: "172.23.1.116"
-  REDIS_PORT: 6379
-  REDIS_DB: 8
-  REDIS_CHANNEL: "ui:updates"
-