diff --git a/chart/templates/mattermost/mattermost/namespace.yaml b/chart/templates/mattermost/mattermost/namespace.yaml
index 2f6c8bb33d11bdfd83b16e347825007609498880..d4283a71ab3f10f8488385d997b83148f34d8896 100644
--- a/chart/templates/mattermost/mattermost/namespace.yaml
+++ b/chart/templates/mattermost/mattermost/namespace.yaml
@@ -37,7 +37,7 @@ metadata:
   labels:
     app.kubernetes.io/name: mattermost
     app.kubernetes.io/component: "collaboration-tools"
-    {{- include "commonLabels" . | nindent 4}}
+    {{- include "commonLabels" $ | nindent 4}}
 stringData:
   DB_CONNECTION_CHECK_URL: "postgres://{{ .username }}:{{ .password }}@{{ .host }}:{{ .port }}/{{ .database }}?connect_timeout=10&sslmode={{ .ssl_mode }}"
   DB_CONNECTION_STRING: "postgres://{{ .username }}:{{ .password }}@{{ .host }}:{{ .port }}/{{ .database }}?connect_timeout=10&sslmode={{ .ssl_mode }}"
@@ -56,10 +56,10 @@ metadata:
   labels:
     app.kubernetes.io/name: mattermost
     app.kubernetes.io/component: "collaboration-tools"
-    {{- include "commonLabels" . | nindent 4}}
+    {{- include "commonLabels" $ | nindent 4}}
 data:
   accesskey: {{ .accessKey | b64enc }}
-  secretkey: {{ .secretKey | b64enc }}
+  secretkey: {{ .accessSecret | b64enc }}
 {{- end }}
 {{- end }}