diff --git a/chart/values.yaml b/chart/values.yaml
index ed74f14d5de0b500bc5c2eaa71682e252da2af24..76a05828f12c32e7b01ec35c72f89a8c36e97cc5 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -1609,11 +1609,11 @@ addons:
     git:
       repo: https://repo1.dso.mil/big-bang/product/packages/mattermost.git
       path: "./chart"
-      tag: "8.1.2-bb.0"
+      tag: "9.0.0-bb.0"
     helmRepo:
       repoName: "registry1"
       chartName: "mattermost"
-      tag: "8.1.2-bb.0"
+      tag: "9.0.0-bb.0"
 
     # -- Flux reconciliation overrides specifically for the Mattermost Package
     flux: {}
diff --git a/tests/test-values.yaml b/tests/test-values.yaml
index 0586c8d0f7cd9b3b41e9e020df20179260ae06ec..cadb613ece8b8b4f8daf5811f2c7fc51adafe217 100644
--- a/tests/test-values.yaml
+++ b/tests/test-values.yaml
@@ -1382,7 +1382,6 @@ addons:
       bbtests:
         enabled: true
         cypress:
-          image: registry1.dso.mil/bigbang-ci/cypress-kubectl:8.3.1
           envs:
             cypress_url: https://chat.bigbang.dev