diff --git a/charts/incubator/mattermost/Chart.yaml b/charts/incubator/mattermost/Chart.yaml
index 72a8f786a36..d069f65cf73 100644
--- a/charts/incubator/mattermost/Chart.yaml
+++ b/charts/incubator/mattermost/Chart.yaml
@@ -24,7 +24,7 @@ name: mattermost
 sources:
 - https://github.com/mattermost/mattermost-server
 - https://github.com/mattermost/docker
-version: 0.0.1
+version: 0.0.2
 annotations:
   truecharts.org/catagories: |
     - hosting
diff --git a/charts/incubator/mattermost/questions.yaml b/charts/incubator/mattermost/questions.yaml
index c49c1679c34..ab773be22e3 100644
--- a/charts/incubator/mattermost/questions.yaml
+++ b/charts/incubator/mattermost/questions.yaml
@@ -74,6 +74,20 @@ questions:
                     - value: "OnDelete"
                       description: "(Legacy) OnDelete: ignore .spec.template changes"
 # Include{controllerExpert}
+  - variable: env
+    group: "Container Configuration"
+    label: "Image Environment"
+    schema:
+      additional_attrs: true
+      type: dict
+      attrs:
+        - variable: MM_SERVICESETTINGS_SITEURL
+          label: "MM_SERVICESETTINGS_SITEURL"
+          description: "HTTPS URL on which you will reach this instance, eg. https://matter.example.com/"
+          schema:
+            type: string
+            required: false
+            default: ""
 
 # Include{containerConfig}
 
diff --git a/charts/incubator/mattermost/values.yaml b/charts/incubator/mattermost/values.yaml
index 701cd66e30e..f481d582d74 100644
--- a/charts/incubator/mattermost/values.yaml
+++ b/charts/incubator/mattermost/values.yaml
@@ -7,7 +7,7 @@ env:
   TIMEZONE: "{{ .Values.TZ }}"
   MM_SQLSETTINGS_DRIVERNAME: "postgres"
   MM_BLEVESETTINGS_INDEXDIR: "/mattermost/bleve-indexes"
-  MM_SERVICESETTINGS_SITEURL: "{{ .Values.env.reverseProxyUrl }}"
+  MM_SERVICESETTINGS_SITEURL: "https://test.example.com"
 
 envValueFrom:
   MM_SQLSETTINGS_DATASOURCE: