diff --git a/argocd/apps/mattermost/mattermnost.yaml b/argocd/apps/mattermost/mattermnost.yaml
index 0ca71ca..e4aa7c2 100644
--- a/argocd/apps/mattermost/mattermnost.yaml
+++ b/argocd/apps/mattermost/mattermnost.yaml
@@ -10,17 +10,9 @@ spec:
     chart: mattermost-team-edition
     helm:
       valuesObject:
-        ingress:
-          enabled: true
-          hosts:
-            - mattermost.innovation-hub-niedersachsen.de
-          tls:
-            - hosts:
-                - mattermost.innovation-hub-niedersachsen.de
-              secretName: mattermost-tls
-          annotations:
-            kubernetes.io/ingress.class: traefik
-            cert-manager.io/cluster-issuer: lets-encrypt-staging
+        image:
+          repository: mattermost/mattermost-team-edition
+          tag: 11.2.1   # <<< Fix-Version
 
         mysql:
           enabled: true
@@ -41,8 +33,18 @@ spec:
             value: "mysql"
           - name: MM_SQLSETTINGS_DATASOURCE
             value: "mmdbuser:mmdbpwd@tcp(mattermost-mysql:3306)/mattermost?charset=utf8mb4,utf8&readTimeout=30s&writeTimeout=30s"
-          - name: MM_CONFIG_DONT_WAIT_FOR_DATABASE
-            value: "true"
+
+        ingress:
+          enabled: true
+          hosts:
+            - mattermost.innovation-hub-niedersachsen.de
+          tls:
+            - hosts:
+                - mattermost.innovation-hub-niedersachsen.de
+              secretName: mattermost-tls
+          annotations:
+            kubernetes.io/ingress.class: traefik
+            cert-manager.io/cluster-issuer: lets-encrypt-staging
 
   destination:
     server: 'https://kubernetes.default.svc'