diff --git a/docker-compose/traefik/configuration.yml.j2 b/docker-compose/authelia/configuration.yml.j2
similarity index 100%
rename from docker-compose/traefik/configuration.yml.j2
rename to docker-compose/authelia/configuration.yml.j2
diff --git a/docker-compose/authelia/docker-compose.yml.j2 b/docker-compose/authelia/docker-compose.yml.j2
new file mode 100644
index 00000000..48b226f9
--- /dev/null
+++ b/docker-compose/authelia/docker-compose.yml.j2
@@ -0,0 +1,41 @@
+# Details/Doku: https://wiki.mgrote.net/pages/_Technik/software/rest/ldap/?h=ldap
+
+services:
+######## traefik ########
+  traefik:
+    container_name: traefik
+    image: "traefik:v3.2.1"
+    restart: unless-stopped
+    pull_policy: missing
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+      - ./traefik.yml:/etc/traefik/traefik.yml
+      - ./file-provider.yml:/etc/traefik/file-provider.yml
+      - acme_data:/etc/traefik/acme
+    networks:
+      - traefik
+    ports:
+      - "80:80" # HTTP
+      - "8081:8080" # Web-GUI
+      - "443:443" # HTTPS
+      - "2222:2222" # SSH
+    environment:
+      TZ: Europe/Berlin
+    healthcheck:
+      test: ["CMD", "traefik", "healthcheck", "--ping"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+    depends_on:
+      - authelia
+
+######## Networks ########
+networks:
+  authelia:
+  traefik:
+    external: true
+  postfix:
+    external: true
+######## Volumes ########
+volumes:
+  acme_data:
diff --git a/docker-compose/traefik/docker-compose.yml.j2 b/docker-compose/traefik/docker-compose.yml.j2
index 433c76ee..0d7b8ad7 100644
--- a/docker-compose/traefik/docker-compose.yml.j2
+++ b/docker-compose/traefik/docker-compose.yml.j2
@@ -1,34 +1,6 @@
-# Details/Doku: https://wiki.mgrote.net/pages/_Technik/hardware/rest/fpv/software/rest/ldap/
+# Details/Doku: https://wiki.mgrote.net/pages/_Technik/software/rest/ldap/?h=ldap
 
 services:
-######## traefik ########
-  traefik:
-    container_name: traefik
-    image: "traefik:v3.2.1"
-    restart: unless-stopped
-    pull_policy: missing
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock:ro
-      - ./traefik.yml:/etc/traefik/traefik.yml
-      - ./file-provider.yml:/etc/traefik/file-provider.yml
-      - acme_data:/etc/traefik/acme
-    networks:
-      - traefik
-    ports:
-      - "80:80" # HTTP
-      - "8081:8080" # Web-GUI
-      - "443:443" # HTTPS
-      - "2222:2222" # SSH
-    environment:
-      TZ: Europe/Berlin
-    healthcheck:
-      test: ["CMD", "traefik", "healthcheck", "--ping"]
-      interval: 30s
-      timeout: 10s
-      retries: 3
-    depends_on:
-      - authelia
-
 ######## authelia ########
   authelia:
     image: authelia/authelia:4.38.17
@@ -64,6 +36,7 @@ services:
       timeout: 10s
       retries: 3
 
+######## Redis ########
   authelia-redis:
     image: "redis:7.4.1"
     container_name: authelia-redis
@@ -114,6 +87,5 @@ networks:
     external: true
 ######## Volumes ########
 volumes:
-  acme_data:
   authelia_data:
   db: