diff --git a/charts/incubator/mattermost/Chart.yaml b/charts/incubator/mattermost/Chart.yaml
index 84782019b6d..99c0c04990c 100644
--- a/charts/incubator/mattermost/Chart.yaml
+++ b/charts/incubator/mattermost/Chart.yaml
@@ -1,13 +1,9 @@
 apiVersion: v2
-appVersion: "7.3"
+appVersion: "v8.0.0"
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
-    version: 11.1.2
-  - condition: postgresql.enabled
-    name: postgresql
-    repository: https://deps.truecharts.org/
-    version: 11.0.31
+    version: 12.14.6
 description: Mattermost is an open source platform for secure collaboration across the entire software development lifecycle.
 home: https://truecharts.org/charts/incubator/mattermost
 icon: https://truecharts.org/img/hotlink-ok/chart-icons/mattermost.png
@@ -25,7 +21,7 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/incubator/mattermost
   - https://github.com/mattermost/mattermost-server
   - https://github.com/mattermost/docker
-version: 7.0.0
+version: 8.0.0
 annotations:
   truecharts.org/catagories: |
     - hosting
diff --git a/charts/incubator/mattermost/templates/NOTES.txt b/charts/incubator/mattermost/templates/NOTES.txt
new file mode 100644
index 00000000000..efcb74cb772
--- /dev/null
+++ b/charts/incubator/mattermost/templates/NOTES.txt
@@ -0,0 +1 @@
+{{- include "tc.v1.common.lib.chart.notes" $ -}}
diff --git a/charts/incubator/mattermost/templates/common.yaml b/charts/incubator/mattermost/templates/common.yaml
index c1a366e1cf0..78d963fb168 100644
--- a/charts/incubator/mattermost/templates/common.yaml
+++ b/charts/incubator/mattermost/templates/common.yaml
@@ -1 +1,2 @@
-{{ include "tc.common.loader.all" . }}
+{{/* Render the templates */}}
+{{ include "tc.v1.common.loader.all" . }}
diff --git a/charts/incubator/mattermost/values.yaml b/charts/incubator/mattermost/values.yaml
index c05972e2cd9..b16db4c4867 100644
--- a/charts/incubator/mattermost/values.yaml
+++ b/charts/incubator/mattermost/values.yaml
@@ -1,18 +1,19 @@
 image:
   repository: tccr.io/truecharts/mattermost
-  tag: 7.3@sha256:be700165a0f8ed996982d758ceb20523f401333f333119ef461857f89ecee792
+  tag: v8.0.0@sha256:e5f3f3b356c2cca249fa261d56ec9ba103432d63636827682a77682a014e2971
   pullPolicy: IfNotPresent
 
-env:
-  TIMEZONE: "{{ .Values.TZ }}"
-  MM_SQLSETTINGS_DRIVERNAME: "postgres"
-  MM_BLEVESETTINGS_INDEXDIR: "/mattermost/bleve-indexes"
-  MM_SERVICESETTINGS_SITEURL: "https://test.example.com"
-  MM_SQLSETTINGS_DATASOURCE:
-    secretKeyRef:
-      name: dbcreds
-      key: urlnossl
-
+workload:
+  main:
+    podSpec:
+      containers:
+        main:
+          env:
+            TIMEZONE: '{{ .Values.TZ }}'
+            MM_SQLSETTINGS_DRIVERNAME: "postgres"
+            MM_BLEVESETTINGS_INDEXDIR: "/mattermost/bleve-indexes"
+            MM_SERVICESETTINGS_SITEURL: "https://test.example.com"
+            MM_SQLSETTINGS_DATASOURCE: '{{ .Values.cnpg.main.creds.std | trimAll "\""  }}'
 service:
   main:
     ports:
@@ -40,11 +41,12 @@ persistence:
     enabled: true
     mountPath: "/mattermost/bleve-indexes"
 
-postgresql:
-  enabled: true
-  existingSecret: "dbcreds"
-  postgresqlUsername: mattermost
-  postgresqlDatabase: mattermost
+cnpg:
+  main:
+    enabled: true
+    user: mattermost
+    database: mattermost
 
 portal:
-  enabled: true
+  open:
+    enabled: true