diff --git a/clusters/yc-k8s-test/infrastructure/kustomization.yaml b/clusters/yc-k8s-test/infrastructure/kustomization.yaml
index 38c8ad9..2908fbd 100644
--- a/clusters/yc-k8s-test/infrastructure/kustomization.yaml
+++ b/clusters/yc-k8s-test/infrastructure/kustomization.yaml
@@ -119,4 +119,11 @@ patches:
       version: v2
       kind: HelmRelease
       name: zitadel
-      namespace: zitadel    
+      namespace: zitadel
+  - path: ./patches/keycloak.yaml
+    target:
+      group: helm.toolkit.fluxcd.io
+      version: v2
+      kind: HelmRelease
+      name: keycloak
+      namespace: keycloak
diff --git a/clusters/yc-k8s-test/infrastructure/patches/keycloak.yaml b/clusters/yc-k8s-test/infrastructure/patches/keycloak.yaml
new file mode 100644
index 0000000..dcfebd0
--- /dev/null
+++ b/clusters/yc-k8s-test/infrastructure/patches/keycloak.yaml
@@ -0,0 +1,22 @@
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: keycloak
+  namespace: keycloak
+spec:
+  interval: 5m
+  timeout: 15m
+  values:
+    global:
+      defaultStorageClass: local-path
+    persistence:
+      enabled: true
+      storageClass: local-path
+      size: 10Gi
+    postgresql:
+      enabled: false
+    externalDatabase:
+      host: "postgresql.postgresql.svc.cluster.local"
+      port: 5432
+      user: keycloak
+      database: keycloak
diff --git a/infrastructure/keycloak/base/helmrelease.yaml b/infrastructure/keycloak/base/helmrelease.yaml
new file mode 100644
index 0000000..8a1ee93
--- /dev/null
+++ b/infrastructure/keycloak/base/helmrelease.yaml
@@ -0,0 +1,22 @@
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: keycloak
+  namespace: keycloak
+spec:
+  interval: 10m
+  chart:
+    spec:
+      chart: keycloak-contour
+      version: "22.2.6"
+      sourceRef:
+        kind: HelmRepository
+        name: yc-oci-charts
+        namespace: flux-system
+      interval: 10m
+  install:
+    remediation:
+      retries: 3
+  upgrade:
+    remediation:
+      retries: 3
diff --git a/infrastructure/keycloak/base/kustomization.yaml b/infrastructure/keycloak/base/kustomization.yaml
new file mode 100644
index 0000000..3b2eef2
--- /dev/null
+++ b/infrastructure/keycloak/base/kustomization.yaml
@@ -0,0 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: keycloak
+resources:
+  - helmrelease.yaml
+  - namespace.yaml
diff --git a/infrastructure/keycloak/base/namespace.yaml b/infrastructure/keycloak/base/namespace.yaml
new file mode 100644
index 0000000..0f8ff36
--- /dev/null
+++ b/infrastructure/keycloak/base/namespace.yaml
@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: keycloak
+  labels:
+    istio-injection: enabled
diff --git a/infrastructure/keycloak/kustomization.yaml b/infrastructure/keycloak/kustomization.yaml
new file mode 100644
index 0000000..85dcd9d
--- /dev/null
+++ b/infrastructure/keycloak/kustomization.yaml
@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - base
diff --git a/infrastructure/kustomization.yaml b/infrastructure/kustomization.yaml
index c00af93..3c2f7d4 100644
--- a/infrastructure/kustomization.yaml
+++ b/infrastructure/kustomization.yaml
@@ -6,6 +6,7 @@ resources:
   - cert-manager
   - dashboard
   - kafka
+  - keycloak
   - local-path-provisioner
   - minio
   - postgresql