diff --git a/chart/values.yaml b/chart/values.yaml
index 9e349e2aaca56a9aebc6ff671e7744570017d815..325c3276c76e12659eed00fd80f203afc17b11ce 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.0"
+      tag: "10.2.0-bb.1"
     helmRepo:
       repoName: "registry1"
       chartName: "mattermost"
-      tag: "10.2.0-bb.0"
+      tag: "10.2.0-bb.1"
 
     # -- Flux reconciliation overrides specifically for the Mattermost Package
     flux: {}
diff --git a/tests/package-mapping.yaml b/tests/package-mapping.yaml
index b98854f2604d4ce50dccc66761905f22cd60d6d9..255a3f8aa62fedd52d41561ca98710fdf5997c22 100644
--- a/tests/package-mapping.yaml
+++ b/tests/package-mapping.yaml
@@ -76,6 +76,14 @@ 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 9ba6fba140eb7eb439de62b6105ffdb16766ebd0..1cbd5afc186c0d2eed63ae95b050a3d5edfe0f53 100644
--- a/tests/rke2-test-values.yaml
+++ b/tests/rke2-test-values.yaml
@@ -288,6 +288,8 @@ 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 7dd0b81547799b95585dbed7e8a26ca5375fc6e3..ae0c7b1feabd975d54d70630facf2cf0cf846f76 100644
--- a/tests/test-values.yaml
+++ b/tests/test-values.yaml
@@ -1878,6 +1878,8 @@ addons:
 
   mattermost:
     enabled: false
+    database:
+      ssl_mode: require
     sso:
       enabled: false
       client_id: dev_00eb8904-5b88-4c68-ad67-cec0d2e07aa6_mattermost
@@ -1885,6 +1887,20 @@ 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:
@@ -1892,6 +1908,17 @@ 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:
@@ -1911,6 +1938,8 @@ addons:
                 resolution: DNS
 
       postgresql:
+        install: false
+        ssl_mode: require
         persistence:
           size: 256Mi
       resources: