diff --git a/chart/values.yaml b/chart/values.yaml
index 9f4d72b8b487ea88e3a43fc60767da725b4c1aaf..687a9ea36682e4e96f917a4ca91f94cb851db215 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -1140,7 +1140,7 @@ addons:
     git:
       repo: https://repo1.dso.mil/platform-one/big-bang/apps/collaboration-tools/mattermost-operator.git
       path: "./chart"
-      tag: "1.17.0-bb.3"
+      tag: "1.18.0-bb.0"
 
     # -- Flux reconciliation overrides specifically for the Mattermost Operator Package
     flux: {}
@@ -1157,7 +1157,7 @@ addons:
     git:
       repo: https://repo1.dso.mil/platform-one/big-bang/apps/collaboration-tools/mattermost.git
       path: "./chart"
-      tag: "0.7.0-bb.1"
+      tag: "6.6.0-bb.0"
 
     # -- Flux reconciliation overrides specifically for the Mattermost Package
     flux: {}