diff --git a/chart/values.yaml b/chart/values.yaml
index c2067429a184819ad465ae54a8376483a62c2ffc..687e00f4bb438f8cd1dbbb2bc1b9adcbca0d264d 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -1648,11 +1648,11 @@ addons:
     git:
       repo: https://repo1.dso.mil/big-bang/product/packages/mattermost.git
       path: "./chart"
-      tag: "10.2.0-bb.1"
+      tag: "10.2.0-bb.2"
     helmRepo:
       repoName: "registry1"
       chartName: "mattermost"
-      tag: "10.2.0-bb.1"
+      tag: "10.2.0-bb.2"
 
     # -- Flux reconciliation overrides specifically for the Mattermost Package
     flux: {}
diff --git a/tests/package-mapping.yaml b/tests/package-mapping.yaml
index 255a3f8aa62fedd52d41561ca98710fdf5997c22..b98854f2604d4ce50dccc66761905f22cd60d6d9 100644
--- a/tests/package-mapping.yaml
+++ b/tests/package-mapping.yaml
@@ -76,14 +76,6 @@ mattermost:
     - "mattermostOperator"
     - "minioOperator"
     - "elasticsearchKibana"
-  bigbang_ci:
-    rds:
-      enabled: true
-      database: ".addons.mattermost.database.database"
-      host: ".addons.mattermost.database.host"
-      port: ".addons.mattermost.database.port"
-      username: ".addons.mattermost.database.username"
-      password: ".addons.mattermost.database.password"
 velero:
   dependencies:
     - "minio"
diff --git a/tests/rke2-test-values.yaml b/tests/rke2-test-values.yaml
index 1cbd5afc186c0d2eed63ae95b050a3d5edfe0f53..9ba6fba140eb7eb439de62b6105ffdb16766ebd0 100644
--- a/tests/rke2-test-values.yaml
+++ b/tests/rke2-test-values.yaml
@@ -288,8 +288,6 @@ addons:
               cpu: 20m
             limits: null
       postgresql:
-        install: false
-        ssl_mode: require
         persistence:
           size: 256Mi
         metrics:
diff --git a/tests/test-values.yaml b/tests/test-values.yaml
index ae0c7b1feabd975d54d70630facf2cf0cf846f76..7dd0b81547799b95585dbed7e8a26ca5375fc6e3 100644
--- a/tests/test-values.yaml
+++ b/tests/test-values.yaml
@@ -1878,8 +1878,6 @@ addons:
 
   mattermost:
     enabled: false
-    database:
-      ssl_mode: require
     sso:
       enabled: false
       client_id: dev_00eb8904-5b88-4c68-ad67-cec0d2e07aa6_mattermost
@@ -1887,20 +1885,6 @@ addons:
     elasticsearch:
       enabled: true
     values:
-      networkPolicies:
-        enabled: true
-        additionalPolicies:
-          - name: postgresql-egress
-            spec: 
-              podSelector: {}
-              policyTypes:
-                - Egress
-              egress:
-                - to: 
-                  ports:
-                    - protocol: TCP 
-                      port: 5432
-                      endPort: 5432
       enterprise:
         enabled: true
       monitoring:
@@ -1908,17 +1892,6 @@ addons:
       istio:
         hardened:
           customServiceEntries:
-            - name: "postgresql-service-entries"
-              enabled: true 
-              spec:
-                hosts:
-                  - "cirds.cqkqilzbp4x2.us-gov-west-1.rds.amazonaws.com"
-                location: MESH_EXTERNAL
-                ports:
-                  - number: 5432
-                    protocol: TCP
-                    name: postgresql
-                resolution: DNS
             - name: "cypress-service-entries-mattermost"
               enabled: true
               spec:
@@ -1938,8 +1911,6 @@ addons:
                 resolution: DNS
 
       postgresql:
-        install: false
-        ssl_mode: require
         persistence:
           size: 256Mi
       resources: