diff --git a/charts/incubator/mattermost/.helmignore b/charts/stable/mattermost/.helmignore
similarity index 100%
rename from charts/incubator/mattermost/.helmignore
rename to charts/stable/mattermost/.helmignore
diff --git a/charts/incubator/mattermost/CHANGELOG.md b/charts/stable/mattermost/CHANGELOG.md
similarity index 100%
rename from charts/incubator/mattermost/CHANGELOG.md
rename to charts/stable/mattermost/CHANGELOG.md
diff --git a/charts/incubator/mattermost/Chart.yaml b/charts/stable/mattermost/Chart.yaml
similarity index 98%
rename from charts/incubator/mattermost/Chart.yaml
rename to charts/stable/mattermost/Chart.yaml
index 9ae346ad3c4..c870d72a360 100644
--- a/charts/incubator/mattermost/Chart.yaml
+++ b/charts/stable/mattermost/Chart.yaml
@@ -24,7 +24,7 @@ name: mattermost
 sources:
 - https://github.com/mattermost/mattermost-server
 - https://github.com/mattermost/docker
-version: 0.0.4
+version: 1.0.0
 annotations:
   truecharts.org/catagories: |
     - hosting
diff --git a/charts/incubator/mattermost/README.md b/charts/stable/mattermost/README.md
similarity index 100%
rename from charts/incubator/mattermost/README.md
rename to charts/stable/mattermost/README.md
diff --git a/charts/incubator/mattermost/questions.yaml b/charts/stable/mattermost/questions.yaml
similarity index 100%
rename from charts/incubator/mattermost/questions.yaml
rename to charts/stable/mattermost/questions.yaml
diff --git a/charts/incubator/mattermost/security.md b/charts/stable/mattermost/security.md
similarity index 100%
rename from charts/incubator/mattermost/security.md
rename to charts/stable/mattermost/security.md
diff --git a/charts/incubator/mattermost/templates/common.yaml b/charts/stable/mattermost/templates/common.yaml
similarity index 100%
rename from charts/incubator/mattermost/templates/common.yaml
rename to charts/stable/mattermost/templates/common.yaml
diff --git a/charts/incubator/mattermost/values.yaml b/charts/stable/mattermost/values.yaml
similarity index 88%
rename from charts/incubator/mattermost/values.yaml
rename to charts/stable/mattermost/values.yaml
index f481d582d74..362f84abc91 100644
--- a/charts/incubator/mattermost/values.yaml
+++ b/charts/stable/mattermost/values.yaml
@@ -1,6 +1,6 @@
 image:
-  repository: mattermost/mattermost-enterprise-edition
-  tag: release-6.3
+  repository: tccr.io/truecharts/mattermost
+  tag: v6.3@sha256:c4fd40cb097b74451e25bf5375c00fe6cb82179fd6e6393fa24efe2826a1d4bc
   pullPolicy: IfNotPresent
 
 env: