diff --git a/chart/values.yaml b/chart/values.yaml
index 5f4e6e17cb2edfaadfe097c02a5de3a6144609df..b7dd77dd2498f102b8333c91576e9a5496a9fc92 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -1044,7 +1044,7 @@ addons:
     git:
       repo: https://repo1.dso.mil/platform-one/big-bang/apps/collaboration-tools/mattermost.git
       path: "./chart"
-      tag: "0.3.0-bb.0"
+      tag: "0.4.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 327b29af3fffe97dca53b4e21df2975d0363d8bd..2138824a4500344fa5946565f6491de0d9f9781a 100644
--- a/tests/test-values.yaml
+++ b/tests/test-values.yaml
@@ -815,12 +815,8 @@ addons:
       bbtests:
         enabled: true
         cypress:
-          artifacts: true
           envs:
             cypress_url: https://chat.bigbang.dev
-            cypress_mm_email: "test@bigbang.dev"
-            cypress_mm_user: "bigbang"
-            cypress_mm_password: "Bigbang#123"
 
   nexus:
     enabled: false