diff --git a/clusters/yc-k8s-test/infrastructure/kustomization.yaml b/clusters/yc-k8s-test/infrastructure/kustomization.yaml
index f2a5e07..38c8ad9 100644
--- a/clusters/yc-k8s-test/infrastructure/kustomization.yaml
+++ b/clusters/yc-k8s-test/infrastructure/kustomization.yaml
@@ -113,3 +113,10 @@ patches:
       kind: HelmRelease
       name: postgresql
       namespace: postgresql
+  - path: ./patches/zitadel.yaml
+    target:
+      group: helm.toolkit.fluxcd.io
+      version: v2
+      kind: HelmRelease
+      name: zitadel
+      namespace: zitadel    
diff --git a/clusters/yc-k8s-test/infrastructure/patches/postgresql.yaml b/clusters/yc-k8s-test/infrastructure/patches/postgresql.yaml
index be14202..421a8ce 100644
--- a/clusters/yc-k8s-test/infrastructure/patches/postgresql.yaml
+++ b/clusters/yc-k8s-test/infrastructure/patches/postgresql.yaml
@@ -64,7 +64,6 @@ spec:
           command:
             - /bin/sh
             - -c
-            - -e
             - exec pg_isready -U "sarex" -d postgres -h 127.0.0.1 -p 5432
         initialDelaySeconds: 5
         periodSeconds: 10
diff --git a/clusters/yc-k8s-test/infrastructure/patches/zitadel.yaml b/clusters/yc-k8s-test/infrastructure/patches/zitadel.yaml
new file mode 100644
index 0000000..89fcbdb
--- /dev/null
+++ b/clusters/yc-k8s-test/infrastructure/patches/zitadel.yaml
@@ -0,0 +1,23 @@
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: zitadel
+  namespace: zitadel
+spec:
+  interval: 5m
+  timeout: 10m
+  values:
+    zitadel:
+      configmapConfig: 
+        ExternalDomain: login.contour.infra.sarex.tech
+    login: 
+      env:    
+        - name: ZITADEL_DATABASE_POSTGRES_HOST
+          value: "postgresql.postgresql.svc.cluster.local"
+        - name: ZITADEL_DATABASE_POSTGRES_PORT
+          value: "5432"
+    env:
+      - name: ZITADEL_DATABASE_POSTGRES_HOST
+        value: "postgresql.postgresql.svc.cluster.local"
+      - name: ZITADEL_DATABASE_POSTGRES_PORT
+        value: "5432"      
diff --git a/infrastructure/zitadel/base/helmrelease.yaml b/infrastructure/zitadel/base/helmrelease.yaml
new file mode 100644
index 0000000..66c01cd
--- /dev/null
+++ b/infrastructure/zitadel/base/helmrelease.yaml
@@ -0,0 +1,22 @@
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: zitadel
+  namespace: zitadel
+spec:
+  interval: 10m
+  chart:
+    spec:
+      chart: idp-contour
+      version: "4.12.2"
+      sourceRef:
+        kind: HelmRepository
+        name: yc-oci-charts
+        namespace: flux-system
+      interval: 10m
+  install:
+    remediation:
+      retries: 3
+  upgrade:
+    remediation:
+      retries: 3
diff --git a/infrastructure/zitadel/base/kustomization.yaml b/infrastructure/zitadel/base/kustomization.yaml
new file mode 100644
index 0000000..ad2777d
--- /dev/null
+++ b/infrastructure/zitadel/base/kustomization.yaml
@@ -0,0 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: postgresql
+resources:
+  - helmrelease.yaml
diff --git a/infrastructure/zitadel/base/namespace.yaml b/infrastructure/zitadel/base/namespace.yaml
new file mode 100644
index 0000000..ffe7f4c
--- /dev/null
+++ b/infrastructure/zitadel/base/namespace.yaml
@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: zitadel
+  labels:
+    istio-injection: enabled
diff --git a/infrastructure/zitadel/kustomization.yaml b/infrastructure/zitadel/kustomization.yaml
new file mode 100644
index 0000000..85dcd9d
--- /dev/null
+++ b/infrastructure/zitadel/kustomization.yaml
@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - base