diff --git a/docker-compose.yml b/docker-compose.yml
index 578cbe25..6cd92b61 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6962,6 +6962,51 @@ services:
         target: /opt/zammad/storage
         type: volume
         volume: {}
+  zitadel:
+    container_name: zitadel
+    image: ghcr.io/zitadel/zitadel:latest
+    command: 'start-from-init --masterkeyFromEnv  --config /config.yaml --config secrets.yaml --config init-steps.yaml --tlsMode external'
+    # depends_on:
+    #   zitadel-pg-db:
+    #     condition: 'service_healthy'
+    environment:
+      ZITADEL_DATABASE_POSTGRES_DATABASE: zitadel
+      ZITADEL_DATABASE_POSTGRES_USER_PASSWORD: ${ZITADEL_DB_PASSWORD}
+      ZITADEL_DATABASE_POSTGRES_ADMIN_PASSWORD: ${ZITADEL_DB_ADMIN_PASSWORD}
+      ZITADEL_MASTERKEY: ${ZITADEL_MASTER_KEY}
+    expose:
+      - 8080
+    labels:
+      - swag=enable
+      - swag_proto=http
+      - swag_port=8080
+      - swag_url=zitadel.${MY_TLD}
+      - homepage.group=System Administration
+      - homepage.name=Zitadel
+      - homepage.href=https://id.${MY_TLD}
+      - homepage.icon=zitadel.svg
+      - homepage.description=Centralized authentication management
+    volumes:
+      - ${DOCKER_VOLUME_CONFIG}/zitadel/config.yaml:/config.yaml
+      - ${DOCKER_VOLUME_CONFIG}/zitadel/init-steps.yaml:/init-steps.yaml
+      - ${DOCKER_VOLUME_CONFIG}/zitadel/secrets.yaml:/secrets.yaml
+  zitadel-pg-db:
+    container_name: zitadel-pg-db
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: ${ZITADEL_DB_ADMIN_PASSWORD}
+    expose:
+      - 5432
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready", "-d", "zitadel"]
+      interval: '10s'
+      timeout: '30s'
+      retries: 5
+      start_period: '20s'
+    image: postgres:16-alpine
+    restart: always
+    volumes: 
+      - zitadel-pg-db:/var/lib/postgresql/data
 volumes:
   authelia-pg-db:
     name: compose_authelia-pg-db