diff --git a/chart/templates/logging/elasticsearch-kibana/values.yaml b/chart/templates/logging/elasticsearch-kibana/values.yaml
index b8090be6a34986a7d610653ceb3f4c7140639860..1c84f60acdcd950911495b492cc5b8057595376f 100644
--- a/chart/templates/logging/elasticsearch-kibana/values.yaml
+++ b/chart/templates/logging/elasticsearch-kibana/values.yaml
@@ -25,6 +25,11 @@ networkPolicies:
     {{- $default := dict "app" (dig "gateways" $gateway "ingressGateway" nil .Values.istio) "istio" nil }}
     {{- toYaml (dig "values" "gateways" $gateway "selector" $default .Values.istio) | nindent 4 }}
 
+{{- if and .Values.addons.mattermost.elasticsearch.enabled .Values.addons.mattermost.enabled }}
+mattermost:
+  enabled: true
+{{- end }}
+
 {{- with .Values.logging.sso }}
 {{- if .enabled }}
 sso:
diff --git a/chart/values.yaml b/chart/values.yaml
index 2224ed378060516704aaafc0c6d5ed180212dde3..365ebe1abc27a50afacfb03e744cdf7d2343edd2 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -418,7 +418,7 @@ logging:
   git:
     repo: https://repo1.dso.mil/platform-one/big-bang/apps/core/elasticsearch-kibana.git
     path: "./chart"
-    tag: "0.7.0-bb.2"
+    tag: "0.7.0-bb.3"
 
   # -- Flux reconciliation overrides specifically for the Logging (EFK) Package
   flux: