diff --git a/argocd/apps/mattermost/mattermnost.yaml b/argocd/apps/mattermost/mattermnost.yaml
index e478e19..1675b69 100644
--- a/argocd/apps/mattermost/mattermnost.yaml
+++ b/argocd/apps/mattermost/mattermnost.yaml
@@ -2,6 +2,8 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: mattermost
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io  
 spec:
   project: default
   source:
@@ -12,26 +14,32 @@ spec:
       valuesObject:
 
         mysql:
-          enabled: true
-          mysqlRootPassword: "mmROOT12345"
-          mysqlUser: "mmdbuser"
-          mysqlPassword: "mmdbpwd"
-          mysqlDatabase: mattermost
-          testFramework:
-            enabled: false
+          enabled: false    # interne MySQL-Instanz deaktivieren
+
+        postgresql:
+          enabled: true     # interne PostgreSQL-Instanz aktivieren
+          postgresqlUsername: mmuser
+          postgresqlPassword: "mmdbpwd"
+          postgresqlDatabase: mattermost
+          auth:
+            enablePostgresUser: true
+          primary:
+            persistence:
+              enabled: true
+              size: 8Gi
 
         externalDB:
-          enabled: false
+          enabled: false    # interne PostgreSQL wird genutzt
 
         config: {}
 
         extraEnvVars:
           - name: MM_SQLSETTINGS_DRIVERNAME
-            value: "mysql"
+            value: "postgres"
           - name: MM_SQLSETTINGS_DATASOURCE
-            value: "mmdbuser:mmdbpwd@tcp(mattermost-mysql:3306)/mattermost?charset=utf8mb4,utf8&readTimeout=30s&writeTimeout=30s"
+            value: "postgres://mmuser:mmdbpwd@mattermost-postgresql:5432/mattermost?sslmode=disable&connect_timeout=10"
           - name: MM_WAIT_FOR_DB
-            value: "true"  
+            value: "true"
 
         ingress:
           enabled: true
@@ -50,8 +58,8 @@ spec:
     namespace: mattermost
 
   syncPolicy:
-    managedNamespaceMetadata:
-      labels: 
+    managedNamespaceMeta:
+      labels:
         pod-security.kubernetes.io/enforce: "privileged"
     automated:
       selfHeal: true