diff --git a/mycloud-matrix/Chart.yaml b/mycloud-matrix/Chart.yaml
index 2789d16..b9fb535 100644
--- a/mycloud-matrix/Chart.yaml
+++ b/mycloud-matrix/Chart.yaml
@@ -6,4 +6,4 @@ maintainers:
   - name: WrenIX
     url: https://wrenix.eu
 
-version: 0.1.0
+version: 0.1.1
diff --git a/mycloud-matrix/README.md b/mycloud-matrix/README.md
index 4ddba77..14cf453 100644
--- a/mycloud-matrix/README.md
+++ b/mycloud-matrix/README.md
@@ -7,7 +7,7 @@ description: "myCloud component to setup matrix"
 
 # mycloud-matrix
 
-![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 myCloud component to setup matrix
 
diff --git a/mycloud-matrix/templates/authentik-application.yaml b/mycloud-matrix/templates/authentik-application.yaml
index 0cfe91f..d3c908f 100644
--- a/mycloud-matrix/templates/authentik-application.yaml
+++ b/mycloud-matrix/templates/authentik-application.yaml
@@ -1,17 +1,22 @@
 ---
-apiVersion: helm.toolkit.fluxcd.io/v2beta2
+apiVersion: source.toolkit.fluxcd.io/v1beta2
+kind: OCIRepository
+metadata:
+  name: "{{ .Release.Name }}-auth"
+spec:
+  url: oci://codeberg.org/wrenix/helm-charts/authentik-application
+  interval: 10m
+  ref:
+    semver: "^0.4.3"
+---
+apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: {{ .Release.Name }}-auth
 spec:
-  chart:
-    spec:
-      sourceRef:
-        kind: GitRepository
-        name: "wrenix-helm-charts"
-        namespace: "flux-system"
-      chart: "./authentik-application"
-      reconcileStrategy: "Revision"
+  chartRef:
+    kind: OCIRepository
+    name: "{{ .Release.Name }}-auth"
   install:
     {{- toYaml .Values.commons.helm.release.install | nindent 4 }}
   test:
diff --git a/mycloud-matrix/templates/bridge/signal.yaml b/mycloud-matrix/templates/bridge/signal.yaml
index 57e99f6..ac74ea7 100644
--- a/mycloud-matrix/templates/bridge/signal.yaml
+++ b/mycloud-matrix/templates/bridge/signal.yaml
@@ -1,6 +1,6 @@
 {{- if .Values.bridge.signal.enabled }}
 ---
-apiVersion: helm.toolkit.fluxcd.io/v2beta2
+apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: "{{ .Release.Name }}-mautrix-bridge-signal"
diff --git a/mycloud-matrix/templates/bridge/slack.yaml b/mycloud-matrix/templates/bridge/slack.yaml
index a966872..5067cde 100644
--- a/mycloud-matrix/templates/bridge/slack.yaml
+++ b/mycloud-matrix/templates/bridge/slack.yaml
@@ -1,6 +1,6 @@
 {{- if .Values.bridge.slack.enabled }}
 ---
-apiVersion: helm.toolkit.fluxcd.io/v2beta2
+apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: "{{ .Release.Name }}-mautrix-bridge-slack"
diff --git a/mycloud-matrix/templates/clients/element-call.yaml b/mycloud-matrix/templates/clients/element-call.yaml
index 42e26d8..5b4b29d 100644
--- a/mycloud-matrix/templates/clients/element-call.yaml
+++ b/mycloud-matrix/templates/clients/element-call.yaml
@@ -7,18 +7,24 @@ metadata:
 data:
   secret: {{ .Values.ingress.elementCall.livekitJWT.livekit.secret | default .Values.livekit.secret | default (derivePassword 1 "long" .Values.commons.masterPassword "matrix" "livekit_secret") | b64enc }}
 ---
-apiVersion: helm.toolkit.fluxcd.io/v2beta2
+apiVersion: source.toolkit.fluxcd.io/v1beta2
+kind: OCIRepository
+metadata:
+  name: "{{ .Release.Name }}-element-call"
+spec:
+  url: oci://codeberg.org/wrenix/helm-charts/element-call
+  interval: 10m
+  ref:
+    semver: "^0.1.5"
+---
+apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: "{{.Release.Name }}-element-call"
 spec:
-  chart:
-    spec:
-      sourceRef:
-        kind: GitRepository
-        name: "wrenix-helm-charts"
-        namespace: "flux-system"
-      chart: "element-call"
+  chartRef:
+    kind: OCIRepository
+    name: "{{ .Release.Name }}-element-call"
   install:
     {{- toYaml .Values.commons.helm.release.install | nindent 4 }}
   test:
diff --git a/mycloud-matrix/templates/clients/element.yaml b/mycloud-matrix/templates/clients/element.yaml
index 86b05d5..db0d0bf 100644
--- a/mycloud-matrix/templates/clients/element.yaml
+++ b/mycloud-matrix/templates/clients/element.yaml
@@ -8,7 +8,7 @@ spec:
   url: https://ananace.gitlab.io/charts
   interval: 10m
 ---
-apiVersion: helm.toolkit.fluxcd.io/v2beta2
+apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: "{{ .Release.Name }}-element-web"
@@ -30,9 +30,6 @@ spec:
   interval: 10m
   values:
     {{- $host := .Values.ingress.element.host | default (printf "element.%s" .Values.commons.ingress.domain) }}
-    image:
-      repository: docker.io/vectorim/element-web
-      tag: v1.11.85
     defaultServer:
       url: https://{{ include "mycloud-matrix.host.server" . }}
       name: {{ include "mycloud-matrix.domain" . | quote }}
diff --git a/mycloud-matrix/templates/clients/hydrogen.yaml b/mycloud-matrix/templates/clients/hydrogen.yaml
index 7cfa75b..9749ca2 100644
--- a/mycloud-matrix/templates/clients/hydrogen.yaml
+++ b/mycloud-matrix/templates/clients/hydrogen.yaml
@@ -1,18 +1,23 @@
 {{- if .Values.ingress.hydrogen.enabled }}
 ---
-apiVersion: helm.toolkit.fluxcd.io/v2beta2
+apiVersion: source.toolkit.fluxcd.io/v1beta2
+kind: OCIRepository
+metadata:
+  name: "{{ .Release.Name }}-hydrogen-web"
+spec:
+  url: oci://codeberg.org/wrenix/helm-charts/hydrogen-web
+  interval: 10m
+  ref:
+    semver: "^0.1.9"
+---
+apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: "{{ .Release.Name }}-hydrogen-web"
 spec:
-  chart:
-    spec:
-      sourceRef:
-        kind: GitRepository
-        name: "wrenix-helm-charts"
-        namespace: "flux-system"
-      chart: "./hydrogen-web"
-      reconcileStrategy: "Revision"
+  chartRef:
+    kind: OCIRepository
+    name: "{{ .Release.Name }}-hydrogen-web"
   install:
     {{- toYaml .Values.commons.helm.release.install | nindent 4 }}
   test:
diff --git a/mycloud-matrix/templates/server/authentication-service.yaml b/mycloud-matrix/templates/server/authentication-service.yaml
index 90a220f..a226c34 100644
--- a/mycloud-matrix/templates/server/authentication-service.yaml
+++ b/mycloud-matrix/templates/server/authentication-service.yaml
@@ -21,19 +21,24 @@ data:
     )
   ) | b64enc }}
 ---
-apiVersion: helm.toolkit.fluxcd.io/v2beta2
+apiVersion: source.toolkit.fluxcd.io/v1beta2
+kind: OCIRepository
+metadata:
+  name: "{{ .Release.Name }}-authentication-service"
+spec:
+  url: oci://codeberg.org/wrenix/helm-charts/matrix-authentication-service
+  interval: 10m
+  ref:
+    semver: "^0.0.7"
+---
+apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: "{{ .Release.Name }}-authentication-service"
 spec:
-  chart:
-    spec:
-      sourceRef:
-        kind: GitRepository
-        name: "wrenix-helm-charts"
-        namespace: "flux-system"
-      chart: "./matrix-authentication-service"
-      reconcileStrategy: "Revision"
+  chartRef:
+    kind: OCIRepository
+    name: "{{ .Release.Name }}-authentication-service"
   install:
     {{- toYaml .Values.commons.helm.release.install | nindent 4 }}
   test:
diff --git a/mycloud-matrix/templates/server/sliding-sync.yaml b/mycloud-matrix/templates/server/sliding-sync.yaml
index b856071..e9cc135 100644
--- a/mycloud-matrix/templates/server/sliding-sync.yaml
+++ b/mycloud-matrix/templates/server/sliding-sync.yaml
@@ -1,18 +1,23 @@
 {{- if .Values.server.slidingSync.enabled }}
 ---
-apiVersion: helm.toolkit.fluxcd.io/v2beta2
+apiVersion: source.toolkit.fluxcd.io/v1beta2
+kind: OCIRepository
+metadata:
+  name: "{{ .Release.Name }}-sliding-sync"
+spec:
+  url: oci://codeberg.org/wrenix/helm-charts/matrix-sliding-sync
+  interval: 10m
+  ref:
+    semver: "^0.2.2"
+---
+apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: "{{ .Release.Name }}-sliding-sync"
 spec:
-  chart:
-    spec:
-      sourceRef:
-        kind: GitRepository
-        name: "wrenix-helm-charts"
-        namespace: "flux-system"
-      chart: "./matrix-sliding-sync"
-      reconcileStrategy: "Revision"
+  chartRef:
+    kind: OCIRepository
+    name: "{{ .Release.Name }}-sliding-sync"
   install:
     {{- toYaml .Values.commons.helm.release.install | nindent 4 }}
   test:
diff --git a/mycloud-matrix/templates/server/synapse.yaml b/mycloud-matrix/templates/server/synapse.yaml
index 87689aa..f5d647d 100644
--- a/mycloud-matrix/templates/server/synapse.yaml
+++ b/mycloud-matrix/templates/server/synapse.yaml
@@ -1,18 +1,23 @@
 {{- if (eq .Values.server.software "synapse") }}
 ---
-apiVersion: helm.toolkit.fluxcd.io/v2beta2
+apiVersion: source.toolkit.fluxcd.io/v1beta2
+kind: OCIRepository
+metadata:
+  name: "{{ .Release.Name }}-synapse"
+spec:
+  url: oci://codeberg.org/wrenix/helm-charts/matrix-synapse
+  interval: 10m
+  ref:
+    semver: "^1.0.2"
+---
+apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: "{{ .Release.Name }}-synapse"
 spec:
-  chart:
-    spec:
-      sourceRef:
-        kind: GitRepository
-        name: "wrenix-helm-charts"
-        namespace: "flux-system"
-      chart: "./matrix-synapse"
-      reconcileStrategy: "Revision"
+  chartRef:
+    kind: OCIRepository
+    name: "{{ .Release.Name }}-synapse"
   install:
     {{- toYaml .Values.commons.helm.release.install | nindent 4 }}
   test: