diff --git a/matrix/docker-compose.yml b/matrix/docker-compose.yml
new file mode 100644
index 0000000..7fb84e9
--- /dev/null
+++ b/matrix/docker-compose.yml
@@ -0,0 +1,56 @@
+services:
+  db:
+    image: postgres:15-alpine
+    container_name: matrix-db
+    restart: unless-stopped
+    environment:
+      POSTGRES_USER: ${POSTGRES_USER}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+      POSTGRES_DB: ${POSTGRES_DB}
+      POSTGRES_INITDB_ARGS: "--encoding=UTF8 --lc-collate=C --lc-ctype=C"
+    volumes:
+      - ${POSTGRES_FOLDER}:/var/lib/postgresql/data
+
+  synapse:
+    image: matrixdotorg/synapse:latest
+    container_name: matrix-synapse
+    restart: unless-stopped
+    depends_on:
+      - db
+    environment:
+      - SYNAPSE_CONFIG_PATH=/data/homeserver.yaml
+    volumes:
+      - ${SYNAPSE_FOLDER}:/data
+      - /mnt/user/appdata/matrix/mautrix-signal/registration.yaml:/data/signal-registration.yaml:ro
+      - /mnt/user/appdata/matrix/mautrix-whatsapp/registration.yaml:/data/whatsapp-registration.yaml:ro
+    ports:
+      - "8008:8008" # Reicht den Synapse-Port an Unraid durch
+      
+  synapse-admin:
+    image: awesometechnologies/synapse-admin:latest
+    container_name: matrix-synapse-admin
+    restart: unless-stopped
+    ports:
+      - "8091:80"
+    depends_on:
+      - synapse
+      
+  mautrix-signal:
+    image: dock.mau.dev/mautrix/signal:latest
+    container_name: mautrix-signal
+    restart: unless-stopped
+    volumes:
+      - /mnt/user/appdata/matrix/mautrix-signal:/data:rw
+    depends_on:
+      - db
+      - synapse
+  
+  mautrix-whatsapp:
+    image: dock.mau.dev/mautrix/whatsapp:latest
+    container_name: mautrix-whatsapp
+    restart: unless-stopped
+    volumes:
+      - /mnt/user/appdata/matrix/mautrix-whatsapp:/data:rw
+    depends_on:
+      - db
+      - synapse
\ No newline at end of file