diff --git a/CHANGELOG.md b/CHANGELOG.md
index a186621c0878e4a2b423f7002529e373035505ee..a76863f4b960b23c0a0214f539735eae1ae34424 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -120,6 +120,9 @@ curl https://repo1.dso.mil/platform-one/big-bang/bigbang/-/raw/master/scripts/de
 * [!463](https://repo1.dso.mil/platform-one/big-bang/bigbang/-/merge_requests/463): Update CODEOWNERS
 
 ### Upgrade Notice
+
+#### Sonarqube Release Information
+
 This release comes with a new version of Sonarqube which requires a manual database upgrade that can be easily done through the web interface. If you see a message stating Sonarqube is under maintenance go to the following url and click update database:
 ```
 https://sonarqube.your.url/setup
diff --git a/chart/templates/minio/minio-operator/values.yaml b/chart/templates/minio/minio-operator/values.yaml
index 33665142d7cf1ae97e2b60db2b55a4d8e7af8492..8adeeb453502a506a2fe9485412ecd76580cd3a3 100644
--- a/chart/templates/minio/minio-operator/values.yaml
+++ b/chart/templates/minio/minio-operator/values.yaml
@@ -10,4 +10,13 @@ podAnnotations:
 
 imagePullSecrets:
   - name: private-registry
+
+networkPolicies:
+  enabled: {{ .Values.networkPolicies.enabled }}
+  controlPlaneCidr: {{ .Values.networkPolicies.controlPlaneCidr }}
+
+monitoring:
+  enabled: {{ .Values.monitoring.enabled }}
+
 {{- end -}}
+
diff --git a/chart/templates/minio/minio/values.yaml b/chart/templates/minio/minio/values.yaml
index 1ec8ad1a3d38376c1ed64ff36b26301051a3714f..46e0da144f448525bbf493ddb202064692db20ef 100644
--- a/chart/templates/minio/minio/values.yaml
+++ b/chart/templates/minio/minio/values.yaml
@@ -18,6 +18,7 @@ monitoring:
 
 networkPolicies:
   enabled: {{ .Values.networkPolicies.enabled }}
+  controlPlaneCidr: {{ .Values.networkPolicies.controlPlaneCidr }}
   ingressLabels:
     {{- $gateway := default "public" .Values.addons.minio.ingress.gateway }}
     {{- $default := dict "app" (dig "gateways" $gateway "ingressGateway" nil .Values.istio) "istio" nil }}
@@ -28,7 +29,12 @@ podAnnotations:
   traffic.sidecar.istio.io/includeInboundPorts: "*"
   traffic.sidecar.istio.io/excludeInboundPorts: "9443"
 
-imagePullSecrets:
-  - name: private-registry
+tenants:
+  imagePullSecret:
+    name: private-registry
+  secrets:
+    accessKey: {{ .Values.addons.minio.accesskey | default "minio" }}
+    secretKey: {{ .Values.addons.minio.secretkey | default "minio123" }}
+
 
 {{- end -}}
diff --git a/chart/values.yaml b/chart/values.yaml
index 9c1c81d0c1b6085b92755f695a48611be246238b..c7d6bc2c07b2ab7b1170d6c979363b58d276b6fa 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -534,7 +534,7 @@ addons:
     git:
       repo: https://repo1.dso.mil/platform-one/big-bang/apps/application-utilities/minio-operator.git
       path: "./chart"
-      tag: "2.0.9-bb.3"
+      tag: "4.1.2-bb.1"
 
     # -- Flux reconciliation overrides specifically for the Minio Operator Package
     flux: {}
@@ -551,7 +551,7 @@ addons:
     git:
       repo: https://repo1.dso.mil/platform-one/big-bang/apps/application-utilities/minio.git
       path: "./chart"
-      tag: "2.0.9-bb.13"
+      tag: "4.1.2-bb.4"
 
     # -- Flux reconciliation overrides specifically for the Minio Package
     flux: {}
@@ -919,7 +919,7 @@ addons:
     git:
       repo: https://repo1.dso.mil/platform-one/big-bang/apps/collaboration-tools/mattermost.git
       path: "./chart"
-      tag: "0.1.6-bb.8"
+      tag: "0.1.7-bb.1"
 
     # -- Flux reconciliation overrides specifically for the Mattermost Package
     flux: {}
diff --git a/tests/ci/k3d/values.yaml b/tests/ci/k3d/values.yaml
index a993aed2da7d4ee71a96ecb9615b9b985a86974b..15f0472cb8ccf4fcde1e159c77f3c68ee5eab5d1 100644
--- a/tests/ci/k3d/values.yaml
+++ b/tests/ci/k3d/values.yaml
@@ -322,6 +322,8 @@ addons:
   minio:
     enabled: false
     values:
+      upgradeTenants:
+        enabled: true
       zones:
         servers: 1
       volumesPerServer: 1
@@ -341,6 +343,8 @@ addons:
           memory: 128Mi
         limits: {}
       minio:
+        upgradeTenants:
+          enabled: true
         zones:
           servers: 1
         volumesPerServer: 1