diff --git a/chart/templates/minio/minio/secret.yaml b/chart/templates/minio/minio/secret.yaml
deleted file mode 100644
index 059f199372b3b4fc6453e9161f9163c017bd94d0..0000000000000000000000000000000000000000
--- a/chart/templates/minio/minio/secret.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-{{- if .Values.addons.minio.enabled }}
-# probably want to get rid of this eventually
-apiVersion: v1
-kind: Secret
-metadata:
-  name: minio-root-creds-secret
-  namespace: minio
-type: Opaque
-data:
-  accesskey: {{ .Values.addons.minio.accesskey | default "minio" | b64enc }}
-  secretkey: {{ .Values.addons.minio.secretkey | default "minio123" | b64enc }}
-{{- end }}
\ No newline at end of file
diff --git a/chart/templates/minio/minio/values.yaml b/chart/templates/minio/minio/values.yaml
index 554557a4357cc8a1103caa2ccb1a11e9e7acb1d1..02200ee11b265f3923a0fc97d3bba6866dd2efd9 100644
--- a/chart/templates/minio/minio/values.yaml
+++ b/chart/templates/minio/minio/values.yaml
@@ -22,8 +22,6 @@ annotations:
   {{ include "istioAnnotation" . }}
 {{- end }}
 
-minioRootCreds: minio-root-creds-secret
-
 monitoring:
   enabled: {{ .Values.monitoring.enabled }}
 
@@ -40,14 +38,15 @@ podAnnotations:
   traffic.sidecar.istio.io/includeInboundPorts: "*"
   traffic.sidecar.istio.io/excludeInboundPorts: "9443"
 
-tenants:
+secrets:
+  accessKey: {{ .Values.addons.minio.accesskey | default "minio" }}
+  secretKey: {{ .Values.addons.minio.secretkey | default "minio123" }}
+
+tenant:
   image:
     pullPolicy: {{ .Values.imagePullPolicy }}
   imagePullSecret:
     name: private-registry
-  secrets:
-    accessKey: {{ .Values.addons.minio.accesskey | default "minio" }}
-    secretKey: {{ .Values.addons.minio.secretkey | default "minio123" }}
   {{- if .Values.monitoring.enabled }}
   prometheusOperator: true
   {{- end }}    
diff --git a/chart/values.yaml b/chart/values.yaml
index 56e64117b841ede994f0468ccabc15382d0ea734..a5b35fc6c5ffc20a8c9e22ca3e30ad76e63ac657 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -790,7 +790,7 @@ addons:
     git:
       repo: https://repo1.dso.mil/platform-one/big-bang/apps/application-utilities/minio.git
       path: "./chart"
-      tag: "4.4.16-bb.0"
+      tag: "4.4.25-bb.0"
 
     # -- Flux reconciliation overrides specifically for the Minio Package
     flux: {}
diff --git a/docs/understanding-bigbang/package-architecture/minio/Architecture.md b/docs/understanding-bigbang/package-architecture/minio/Architecture.md
index 7ca08a776b16d73bea3338564e4b4dcd63d38e68..f58cb337df272f5fc350ed9a2d2a3fdc17b29493 100644
--- a/docs/understanding-bigbang/package-architecture/minio/Architecture.md
+++ b/docs/understanding-bigbang/package-architecture/minio/Architecture.md
@@ -81,7 +81,7 @@ No current SSO is avaiable via Keycloak.
 
 ## Configuring access to Minio without SSO
 
-Initial access to the MinIO server is via the minioRootCreds. These can be auto generated for you by adding the accesskey and secret key in your Big Bang config.
+Initial access to the MinIO server is via the accessKey and secretKey values in the top level values file.
 
 ```
 addons:
diff --git a/tests/rke2-test-values.yaml b/tests/rke2-test-values.yaml
index 832a80d4eb4261388a939186587f0b52459fd94a..3165653dd50e70ef4582205d5d477b6dcbd4b393 100644
--- a/tests/rke2-test-values.yaml
+++ b/tests/rke2-test-values.yaml
@@ -389,7 +389,7 @@ addons:
 
   minio:
     values:
-      tenants:
+      tenant:
         pools:
         - servers: 2
           volumesPerServer: 4
@@ -450,4 +450,4 @@ addons:
           cpu: 100m
           memory: 256Mi
         limits: null
-        
\ No newline at end of file
+        
diff --git a/tests/test-values.yaml b/tests/test-values.yaml
index c6da5dc561dda248222ae8c1077bf6c088ef7f54..979a85f979cc96f7ad0667a72594132916875a5d 100644
--- a/tests/test-values.yaml
+++ b/tests/test-values.yaml
@@ -173,6 +173,7 @@ gatekeeper:
           - logging/logging-cypress-test
           - tempo/tempo-cypress-test
           - argocd/argo-cd-cypress-test
+          - minio/minio-instance-cypress-test
           # Allow kyverno test vectors for Helm test
           - default/restrict-host-path-mount-.?
           - default/restrict-host-path-write-.?
@@ -273,6 +274,7 @@ gatekeeper:
           - logging/logging-cypress-test
           - tempo/tempo-cypress-test
           - argocd/argo-cd-cypress-test
+          - minio/minio-instance-cypress-test
           # Allow kyverno test vectors for Helm test
           - default/restrict-host-path-mount-.?
           - default/restrict-host-path-write-.?
@@ -386,6 +388,7 @@ kyvernopolicies:
               - logging
               - tempo
               - argocd
+              - minio
               names:
               - "*-cypress-test*"
         parameters:
@@ -416,6 +419,7 @@ kyvernopolicies:
               - logging
               - tempo
               - argocd
+              - minio
               names:
               - "*-cypress-test*"
         parameters:
@@ -456,6 +460,7 @@ kyvernopolicies:
               - logging
               - tempo
               - argocd
+              - minio
               names:
               - "*-cypress-test*"
       update-image-pull-policy:
@@ -1126,7 +1131,7 @@ addons:
   minio:
     enabled: false
     values:
-      tenants:
+      tenant:
         pools:
         - servers: 2
           volumesPerServer: 4