diff --git a/compose/immich/docker-compose.yml b/compose/immich/docker-compose.yml
index 34906bb..46a8007 100644
--- a/compose/immich/docker-compose.yml
+++ b/compose/immich/docker-compose.yml
@@ -1,56 +1,69 @@
-version: '3.8'
+version: '3.9'
 
 services:
+  # -----------------------------
+  # Postgres für Immich
+  # -----------------------------
   immich-db:
     image: tensorchord/pgvecto-rs:pg15-v0.2.0
     container_name: immich-db
+    restart: unless-stopped
     environment:
       POSTGRES_USER: immich
-      POSTGRES_PASSWORD: immichpass
+      POSTGRES_PASSWORD: immich
       POSTGRES_DB: immich
     volumes:
       - /srv/docker/daten/immich/db:/var/lib/postgresql/data
-    restart: unless-stopped
     networks:
       - immich-net
 
+  # -----------------------------
+  # Redis für Caching
+  # -----------------------------
   immich-redis:
     image: redis:latest
     container_name: immich-redis
+    restart: unless-stopped
     volumes:
       - /srv/docker/daten/immich/redis:/data
-    restart: unless-stopped
     networks:
       - immich-net
 
+  # -----------------------------
+  # Immich Server
+  # -----------------------------
   immich-server:
     image: ghcr.io/immich-app/immich-server:release
     container_name: immich-server
+    restart: unless-stopped
+    ports:
+      - "2283:3001"  # extern 2283 -> intern 3001
+    environment:
+      DATABASE_URL: postgres://immich:immich@immich-db:5432/immich
+      REDIS_HOST: immich-redis
+      IMMICH_SERVER_URL: http://immich-server:3001
     depends_on:
       - immich-db
       - immich-redis
-    environment:
-      HOST: 0.0.0.0
-      PORT: 3001
-      DATABASE_URL: postgres://immich:immichpass@immich-db:5432/immich
-      REDIS_URL: redis://immich-redis:6379
-    ports:
-      - "2283:3001"   # Port auf VM, für Browser/App erreichbar
-    restart: unless-stopped
     networks:
       - immich-net
 
+  # -----------------------------
+  # Immich Machine Learning Service
+  # -----------------------------
   immich-ml:
     image: ghcr.io/immich-app/immich-machine-learning:release
     container_name: immich-ml
-    depends_on:
-      - immich-server
+    restart: unless-stopped
     environment:
       IMMICH_SERVER_URL: http://immich-server:3001
-    restart: unless-stopped
+      REDIS_HOST: immich-redis
+    depends_on:
+      - immich-server
+      - immich-redis
     networks:
       - immich-net
 
 networks:
   immich-net:
-    name: immich-net
\ No newline at end of file
+    driver: bridge
\ No newline at end of file