diff --git a/argocd/apps/mattermost/.mattermnost.bak.swp b/argocd/apps/mattermost/.mattermnost.bak.swp
new file mode 100644
index 0000000..26e4aed
Binary files /dev/null and b/argocd/apps/mattermost/.mattermnost.bak.swp differ
diff --git a/argocd/apps/mattermost/mattermnost.yaml b/argocd/apps/mattermost/mattermnost.yaml
index 8f4c8fc..23e5e9a 100644
--- a/argocd/apps/mattermost/mattermnost.yaml
+++ b/argocd/apps/mattermost/mattermnost.yaml
@@ -25,35 +25,39 @@ spec:
             kubernetes.io/ingress.class: traefik
             traefik.ingress.kubernetes.io/router.tls: "true"
             traefik.ingress.kubernetes.io/router.middlewares: default-http-redirect@kubernetescrd
-            cert-manager.io/cluster-issuer: lets-encrypt-staging
+            cert-manager.io/cluster-issuer: lets-encrypt
         
-        # MySQL Database Configuration
+        # Disable MySQL
         mysql:
+          enabled: false
+        
+        # Enable PostgreSQL
+        postgresql:
           enabled: true
-          mysqlRootPassword: "changeme-root-password"
-          mysqlUser: "mmdbuser"
-          mysqlPassword: "mmdbpwd"
-          mysqlDatabase: "mattermost"
+          auth:
+            username: mmdbuser
+            password: mmdbpwd
+            database: mattermost
+            postgresPassword: InnoHubDB_2025!
+          primary:
+            persistence:
+              enabled: true
+              size: 8Gi
+              # Optional: specify storageClass
+              # storageClass: ""
         
         # Disable External Database
         externalDB:
           enabled: false
         
-        # WICHTIG: Verwende keine config.json oder configJSON
-        # Nur Environment Variables
-        extraEnvVars:
-          - name: MM_SERVICESETTINGS_SITEURL
-            value: "https://mattermost.innovation-hub-niedersachsen.de"
-          - name: MM_SERVICESETTINGS_LISTENADDRESS
-            value: ":8065"
-          - name: MM_SQLSETTINGS_DRIVERNAME
-            value: "mysql"
-          - name: MM_SQLSETTINGS_DATASOURCE
-            value: "mmdbuser:mmdbpwd@tcp(mattermost-mysql:3306)/mattermost?charset=utf8mb4,utf8&readTimeout=30s&writeTimeout=30s"
-        
-        # Deaktiviere das automatische Config Secret
-        # Damit MM_CONFIG nicht gesetzt wird
-        extraInitContainers: []
+        # Mattermost Configuration
+        configJSON:
+          ServiceSettings:
+            SiteURL: "https://mattermost.innovation-hub-niedersachsen.de"
+            ListenAddress: ":8065"
+          SqlSettings:
+            DriverName: "postgres"
+            # DataSource wird automatisch generiert vom Chart
   
   destination:
     server: 'https://kubernetes.default.svc'