diff --git a/mattermost-mcp/Chart.yaml b/mattermost-mcp/Chart.yaml
new file mode 100644
index 0000000..d6f3c4e
--- /dev/null
+++ b/mattermost-mcp/Chart.yaml
@@ -0,0 +1,9 @@
+apiVersion: v2
+name: mattermost-mcp
+description: Mattermost MCP server Helm chart
+type: application
+version: 0.1.0
+appVersion: "0.5.1"
+annotations:
+  version-source: github-release:cloud-ru-tech/mcp-server-mattermost
+  version-pattern: "s|^v||"
diff --git a/mattermost-mcp/templates/deployment.yaml b/mattermost-mcp/templates/deployment.yaml
new file mode 100644
index 0000000..3f43689
--- /dev/null
+++ b/mattermost-mcp/templates/deployment.yaml
@@ -0,0 +1,71 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ .Release.Name }}
+  labels:
+    app.kubernetes.io/name: {{ .Chart.Name }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+    app.kubernetes.io/component: mcp
+    app.kubernetes.io/part-of: mattermost
+  annotations:
+    version-source: {{ index .Chart.Annotations "version-source" }}
+    version-pattern: {{ index .Chart.Annotations "version-pattern" | quote }}
+spec:
+  replicas: 1
+  strategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxUnavailable: 0
+      maxSurge: 1
+  selector:
+    matchLabels:
+      app: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app: {{ .Release.Name }}
+    spec:
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      containers:
+        - name: {{ .Chart.Name }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          ports:
+            - containerPort: {{ .Values.port }}
+              name: http
+              protocol: TCP
+          env:
+            {{- range $key, $value := .Values.env }}
+            - name: {{ $key }}
+              value: {{ $value | quote }}
+            {{- end }}
+            {{- range .Values.secretEnvKeys }}
+            - name: {{ .envName }}
+              valueFrom:
+                secretKeyRef:
+                  name: {{ $.Values.existingSecret }}
+                  key: {{ .secretKey }}
+            {{- end }}
+          livenessProbe:
+            httpGet:
+              path: /health
+              port: http
+            initialDelaySeconds: 20
+            periodSeconds: 15
+            failureThreshold: 3
+          readinessProbe:
+            httpGet:
+              path: /health
+              port: http
+            initialDelaySeconds: 10
+            periodSeconds: 10
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}
diff --git a/mattermost-mcp/templates/ingress.yaml b/mattermost-mcp/templates/ingress.yaml
new file mode 100644
index 0000000..6a80701
--- /dev/null
+++ b/mattermost-mcp/templates/ingress.yaml
@@ -0,0 +1,27 @@
+{{- range $name, $config := .Values.ingresses }}
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: {{ $.Release.Name }}-{{ $name }}
+  {{- with $config.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  rules:
+    - host: {{ $config.host }}
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: {{ $.Release.Name }}
+                port:
+                  number: {{ $.Values.port }}
+  {{- with $config.tls }}
+  tls:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{- end }}
diff --git a/mattermost-mcp/templates/service.yaml b/mattermost-mcp/templates/service.yaml
new file mode 100644
index 0000000..cff6060
--- /dev/null
+++ b/mattermost-mcp/templates/service.yaml
@@ -0,0 +1,16 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Release.Name }}
+  labels:
+    app.kubernetes.io/name: {{ .Chart.Name }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+spec:
+  type: ClusterIP
+  selector:
+    app: {{ .Release.Name }}
+  ports:
+    - name: http
+      port: {{ .Values.port }}
+      targetPort: http
+      protocol: TCP
diff --git a/mattermost-mcp/values.yaml b/mattermost-mcp/values.yaml
new file mode 100644
index 0000000..c8684a4
--- /dev/null
+++ b/mattermost-mcp/values.yaml
@@ -0,0 +1,43 @@
+image:
+  # legard/mcp-server-mattermost on Docker Hub -- cloud-ru-tech/mcp-server-mattermost upstream.
+  repository: legard/mcp-server-mattermost
+  tag: ""
+  pullPolicy: IfNotPresent
+
+port: 8000
+
+existingSecret: ""
+secretEnvKeys: []
+  # - envName: MATTERMOST_TOKEN
+  #   secretKey: MATTERMOST_TOKEN
+
+# Additional environment variables (non-secret)
+env:
+  MCP_TRANSPORT: "http"
+  MCP_HOST: "0.0.0.0"
+  MCP_PORT: "8000"
+  MATTERMOST_AUTH_MODE: "static_token"
+  # MATTERMOST_URL: "https://chat.example.com"
+
+resources:
+  requests:
+    cpu: "50m"
+    memory: "128Mi"
+  limits:
+    cpu: "500m"
+    memory: "512Mi"
+
+nodeSelector: {}
+
+tolerations: []
+
+ingresses: {}
+  # https:
+  #   host: mm.mcp.example.com
+  #   annotations: {}
+  #   tls:
+  #     - hosts:
+  #         - mm.mcp.example.com
+  # lan:
+  #   host: mm.mcp.example.lan
+  #   annotations: {}