diff --git a/apps/base/infra/kustomization.yaml b/apps/base/infra/kustomization.yaml
index 20eeef3..257d445 100644
--- a/apps/base/infra/kustomization.yaml
+++ b/apps/base/infra/kustomization.yaml
@@ -5,5 +5,4 @@ resources:
   - ns-matrix.yaml
   - cert-manager-repo.yaml
   - cert-manager.yaml
-  - ../matrix/ess-repo.yaml
-  - ../matrix/ess-operator.yaml
\ No newline at end of file
+  - ../matrix/ess-repo.yaml
\ No newline at end of file
diff --git a/apps/base/matrix/ess-repo.yaml b/apps/base/matrix/ess-repo.yaml
index bdda88a..a81bfac 100644
--- a/apps/base/matrix/ess-repo.yaml
+++ b/apps/base/matrix/ess-repo.yaml
@@ -1,9 +1,10 @@
 apiVersion: source.toolkit.fluxcd.io/v1
-kind: HelmRepository
+kind: GitRepository
 metadata:
-  name: element-charts
+  name: ess-community-charts
   namespace: flux-system
 spec:
-  type: oci
-  url: oci://ghcr.io/element-hq/charts
-  interval: 5m
\ No newline at end of file
+  interval: 10m
+  url: https://github.com/element-hq/ess-helm
+  ref:
+    branch: main
\ No newline at end of file
diff --git a/apps/production/element-server-suite.yaml b/apps/production/element-server-suite.yaml
index 979be9b..fe4ce5b 100644
--- a/apps/production/element-server-suite.yaml
+++ b/apps/production/element-server-suite.yaml
@@ -1,27 +1,37 @@
-apiVersion: element.io/v1alpha1
-kind: ElementServerSuite
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
 metadata:
   name: matrix-stack
   namespace: matrix
 spec:
-  # Hier nutzen wir deine Hostnames
-  domain: axion1337.chat
-  
-  # Wir verweisen auf den ClusterIssuer, den wir gerade erstellt haben
-  tls:
-    issuerName: letsencrypt-prod
-    issuerKind: ClusterIssuer
-
-  # Hier kommen die Komponenten rein, die du willst
-  components:
+  interval: 1h
+  chart:
+    spec:
+      chart: ./charts/element-server-suite
+      sourceRef:
+        kind: GitRepository
+        name: ess-community-charts
+        namespace: flux-system
+  # Hier kommen deine Hostnames und Konfigurationen rein
+  values:
+    global:
+      domainName: axion1337.chat
+      postgresql:
+        existingSecret: matrix-postgres-auth
     synapse:
       enabled: true
-      host: matrix.axion1337.chat
-    elementWeb:
+      config:
+        serverName: axion1337.chat
+    element-web:
       enabled: true
-      host: axion1337.chat
-    adminConsole:
+    ingress:
       enabled: true
-      host: admin.axion1337.chat
-    wellKnown:
-      enabled: true
\ No newline at end of file
+      className: traefik
+      annotations:
+        cert-manager.io/cluster-issuer: letsencrypt-prod
+        traefik.ingress.kubernetes.io/router.tls: "true"
+      hosts:
+        - host: axion1337.chat
+          paths: [{ path: /, pathType: Prefix }]
+        - host: matrix.axion1337.chat
+          paths: [{ path: /, pathType: Prefix }]
\ No newline at end of file