diff --git a/chart/templates/mattermost/mattermost/mattermost-helmrelease.yaml b/chart/templates/mattermost/mattermost/mattermost-helmrelease.yaml
index f88646cd6da0f40a31212ada0f05149085480a54..6a0202cde43d88fdca67278ce44c5839b4f07c4e 100644
--- a/chart/templates/mattermost/mattermost/mattermost-helmrelease.yaml
+++ b/chart/templates/mattermost/mattermost/mattermost-helmrelease.yaml
@@ -66,4 +66,9 @@ spec:
       namespace: {{ $.Release.Namespace }}
     {{- end }}
     {{- end }}
+
+    {{- if and .Values.addons.mattermost.elasticsearch.enabled .Values.logging.enabled }}
+    - name: ek
+      namespace: {{ $.Release.Namespace }}
+    {{- end }}
 {{- end }}
diff --git a/chart/templates/mattermost/mattermost/values.yaml b/chart/templates/mattermost/mattermost/values.yaml
index c4c103e14096c0e4c8798da8be952e2e04548c12..1a7a4eb2a940b92cefec9c53a49c2cbef9320c27 100644
--- a/chart/templates/mattermost/mattermost/values.yaml
+++ b/chart/templates/mattermost/mattermost/values.yaml
@@ -60,4 +60,9 @@ minio:
     - name: private-registry
 {{- end }}
 {{- end }}
+
+{{- if .Values.addons.mattermost.elasticsearch.enabled }}
+elasticsearch:
+  enabled: true
+{{- end }}
 {{- end -}}
diff --git a/chart/values.yaml b/chart/values.yaml
index 874d8173eee83114281aad78ad86b4627fd6de2e..8a011712ae4e20d463833f04f9b297dd70873586 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -668,7 +668,7 @@ addons:
     git:
       repo: https://repo1.dso.mil/platform-one/big-bang/apps/collaboration-tools/mattermost.git
       path: "./chart"
-      tag: "0.1.3-bb.2"
+      tag: "0.1.4-bb.0"
 
     # -- Mattermost Enterprise functionality.
     enterprise:
@@ -740,6 +740,13 @@ addons:
       # -- Bucket name to use for Mattermost - will be auto-created.
       bucket: ""
 
+    # -- Mattermost Elasticsearch integration - requires enterprise E20 license - https://docs.mattermost.com/deployment/elasticsearch.html
+    # Connection info defaults to the BB deployed Elastic, all values can be overridden via the "values" passthrough for other connections.
+    # See values spec in MM chart "elasticsearch" yaml block - https://repo1.dso.mil/platform-one/big-bang/apps/collaboration-tools/mattermost/-/blob/main/chart/values.yaml
+    elasticsearch:
+      # -- Toggle interaction with Elastic for optimized search indexing
+      enabled: false
+
     # -- Values to passthrough to the Mattermost chart: https://repo1.dso.mil/platform-one/big-bang/apps/collaboration-tools/mattermost/-/blob/main/chart/values.yaml
     values: {}
 
diff --git a/tests/ci/k3d/values.yaml b/tests/ci/k3d/values.yaml
index 9ea515e36bf8d7a871d7b81569abc06992b50e9e..8e8f9a55f6d046542d1fb8408d1f4af14d555dd6 100644
--- a/tests/ci/k3d/values.yaml
+++ b/tests/ci/k3d/values.yaml
@@ -340,6 +340,8 @@ addons:
 
   mattermost:
     enabled: false
+    elasticsearch:
+      enabled: true
     values:
       replicaCount: 1
       resources: