diff --git a/tests/rke2-test-values.yaml b/tests/rke2-test-values.yaml
index 64a854b8febbd3150c3ffa500fd5f582b5516efc..1e845a8984214cf0eab24592b607c1723f8c7bba 100644
--- a/tests/rke2-test-values.yaml
+++ b/tests/rke2-test-values.yaml
@@ -415,7 +415,10 @@ addons:
             runAsGroup: 1001
             fsGroup: 1001
             runAsNonRoot: true
-
+          containerSecurityContext:
+            runAsUser: 1000
+            runAsGroup: 1000
+            runAsNonRoot: true
 
   mattermost:
     values:
@@ -428,7 +431,7 @@ addons:
           memory: 256Mi
         limits: null
       minio:
-        tenants:
+        tenant:
           pools:
           - servers: 1
             volumesPerServer: 4
@@ -442,6 +445,11 @@ addons:
               runAsUser: 1001
               runAsGroup: 1001
               fsGroup: 1001
+              runAsNonRoot: true
+            containerSecurityContext:
+              runAsUser: 1000
+              runAsGroup: 1000
+              runAsNonRoot: true
             
   nexusRepositoryManager:
     values:
diff --git a/tests/test-values.yaml b/tests/test-values.yaml
index 6b60776ce88e2607a7691a47360aba9e635e1dc6..b3abc2571322da7af1fdb176ba859de42cb0046f 100644
--- a/tests/test-values.yaml
+++ b/tests/test-values.yaml
@@ -1247,6 +1247,10 @@ addons:
             runAsGroup: 1001
             fsGroup: 1001
             runAsNonRoot: true
+          containerSecurityContext:
+            runAsUser: 1000
+            runAsGroup: 1000
+            runAsNonRoot: true
       bbtests:
         # There have been intermittent failures of the tests in the past.   The issue is tracked in the below issue.
         # https://repo1.dso.mil/platform-one/big-bang/apps/application-utilities/minio/-/issues/7
@@ -1298,6 +1302,11 @@ addons:
               runAsUser: 1001
               runAsGroup: 1001
               fsGroup: 1001
+              runAsNonRoot: true
+            containerSecurityContext:
+              runAsUser: 1000
+              runAsGroup: 1000
+              runAsNonRoot: true
       bbtests:
         enabled: true
         cypress: