diff --git a/mycloud-matrix/README.md b/mycloud-matrix/README.md
index 9a5de18..ec8fa5e 100644
--- a/mycloud-matrix/README.md
+++ b/mycloud-matrix/README.md
@@ -126,6 +126,12 @@ myCloud component to setup matrix
 | databases.slidingSync.username | string | `"matrix-sliding-sync"` |  |
 | ingress.authenticationService.annotations | object | `{}` |  |
 | ingress.authenticationService.host | string | `nil` | default: auth.matrix.(.commons.ingress.domain) |
+| ingress.cinny.annotations | object | `{}` |  |
+| ingress.cinny.enabled | bool | `false` |  |
+| ingress.cinny.featuredCommunities.rooms | list | `[]` | add rooms to featured communites in cinny |
+| ingress.cinny.featuredCommunities.servers | list | `[]` | add servers to featured communites in cinny |
+| ingress.cinny.featuredCommunities.spaces | list | `[]` | set spaces as featured communites in cinny |
+| ingress.cinny.host | string | `nil` | default: cinny.(.commons.ingress.domain) |
 | ingress.element.annotations | object | `{}` |  |
 | ingress.element.config.features.feature_location_share_live | bool | `true` |  |
 | ingress.element.config.features.feature_new_room_decoration_ui | bool | `true` |  |
diff --git a/mycloud-matrix/templates/clients/cinny.yaml b/mycloud-matrix/templates/clients/cinny.yaml
new file mode 100644
index 0000000..62ea4ee
--- /dev/null
+++ b/mycloud-matrix/templates/clients/cinny.yaml
@@ -0,0 +1,80 @@
+{{- if .Values.ingress.cinny.enabled }}
+---
+apiVersion: source.toolkit.fluxcd.io/v1beta2
+kind: OCIRepository
+metadata:
+  name: "{{ .Release.Name }}-cinny"
+spec:
+  url: oci://codeberg.org/wrenix/helm-charts/cinny
+  interval: 10m
+  ref:
+    semver: "^0.2.1"
+---
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: "{{ .Release.Name }}-cinny"
+spec:
+  chartRef:
+    kind: OCIRepository
+    name: "{{ .Release.Name }}-cinny"
+  install:
+    {{- toYaml .Values.commons.helm.release.install | nindent 4 }}
+  test:
+    {{- toYaml .Values.commons.helm.release.test | nindent 4 }}
+  upgrade:
+    {{- toYaml .Values.commons.helm.release.upgrade | nindent 4 }}
+  driftDetection:
+    {{- toYaml .Values.commons.helm.release.driftDetection | nindent 4 }}
+  interval: 10m
+  values:
+    {{- $host := .Values.ingress.cinny.host | default (printf "cinny.%s" .Values.commons.ingress.domain) }}
+    config:
+      defaultHomeserver: 0
+      homeserverList:
+        - {{ include "mycloud-matrix.domain" . | quote }}
+      featuredCommunities:
+        spaces:
+          {{- toYaml .Values.ingress.cinny.featuredCommunities.spaces | nindent 10 }}
+        rooms:
+          {{- toYaml .Values.ingress.cinny.featuredCommunities.rooms | nindent 10 }}
+        servers:
+          {{- with .Values.ingress.cinny.featuredCommunities.server }}
+          {{- toYaml . | nindent 10 }}
+          {{- else }}
+          - {{ include "mycloud-matrix.domain" . | quote }}
+          {{- end }}
+    {{- if .Values.commons.networkpolicies.enabled }}
+    networkPolicy:
+      enabled: true
+      ingress:
+        http:
+          {{- toYaml .Values.commons.networkpolicies.from.ingress | nindent 10 }}
+      egress:
+        enabled: true
+    {{- end }}
+    ingress:
+      enabled: true
+      annotations:
+        {{- with .Values.commons.ingress.annotations }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+        {{- with .Values.ingress.cinny.annotations }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+      hosts:
+        - host: {{ $host | quote }}
+          paths:
+            - path: /
+              pathType: ImplementationSpecific
+      {{- if .Values.commons.ingress.tls.enabled }}
+      tls:
+        {{- with .Values.commons.ingress.tls.override }}
+        {{- toYaml . | nindent 8 }}
+        {{- else }}
+        - secretName: "{{ .Release.Name }}-cinny-cert"
+          hosts:
+            - "{{ $host }}"
+        {{- end }}
+      {{- end }}
+{{- end }}
diff --git a/mycloud-matrix/values.yaml b/mycloud-matrix/values.yaml
index 662f1af..3573c7a 100644
--- a/mycloud-matrix/values.yaml
+++ b/mycloud-matrix/values.yaml
@@ -208,6 +208,18 @@ ingress:
     # -- default: hydrogen.(.commons.ingress.domain)
     host:
     annotations: {}
+  cinny:
+    enabled: false
+    # -- default: cinny.(.commons.ingress.domain)
+    host:
+    annotations: {}
+    featuredCommunities:
+      # -- set spaces as featured communites in cinny
+      spaces: []
+      # -- add rooms to featured communites in cinny
+      rooms: []
+      # -- add servers to featured communites in cinny
+      servers: []
   livekit:
     enabled: false
     # -- default: sfu.call.(.commons.ingress.domain)