diff --git a/charts/testkube-enterprise/Chart.yaml b/charts/testkube-enterprise/Chart.yaml
index 4df0cad0..984c4306 100644
--- a/charts/testkube-enterprise/Chart.yaml
+++ b/charts/testkube-enterprise/Chart.yaml
@@ -34,7 +34,7 @@ dependencies:
     version: 1.2.6-2
     repository: "file://./charts/nats"
   - name: minio
-    version: 14.7.0
+    version: 14.8.3-1
     repository: https://charts.bitnami.com/bitnami
     condition: minio.enabled
 maintainers:
diff --git a/charts/testkube-enterprise/charts/minio/Chart.yaml b/charts/testkube-enterprise/charts/minio/Chart.yaml
index a7406133..c589b3e3 100644
--- a/charts/testkube-enterprise/charts/minio/Chart.yaml
+++ b/charts/testkube-enterprise/charts/minio/Chart.yaml
@@ -34,4 +34,4 @@ maintainers:
 name: minio
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/minio
-version: 14.8.3
+version: 14.8.3-1
diff --git a/charts/testkube-enterprise/charts/minio/templates/standalone/deployment.yaml b/charts/testkube-enterprise/charts/minio/templates/standalone/deployment.yaml
index 7a33bf3c..3237b310 100644
--- a/charts/testkube-enterprise/charts/minio/templates/standalone/deployment.yaml
+++ b/charts/testkube-enterprise/charts/minio/templates/standalone/deployment.yaml
@@ -65,8 +65,8 @@ spec:
       {{- if .Values.hostAliases }}
       hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.hostAliases "context" $) | nindent 8 }}
       {{- end }}
-      {{- if .Values.podSecurityContext.enabled }}
-      securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" .Values.podSecurityContext "context" $) | nindent 8 }}
+      {{- if .Values.podSecurityContext.enabled .Values.global.podSecurityContext }}
+      securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" (or .Values.global.podSecurityContext .Values.podSecurityContext) "context" $)  | nindent 8 -}}
       {{- end }}
       {{- if .Values.terminationGracePeriodSeconds }}
       terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}
@@ -103,8 +103,8 @@ spec:
         - name: minio
           image: {{ include "minio.image" . }}
           imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
-          {{- if .Values.containerSecurityContext.enabled }}
-          securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" .Values.containerSecurityContext "context" $) | nindent 12 }}
+          {{- if or .Values.tls.securityContext .Values.global.containerSecurityContext }}
+          securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" (or .Values.global.containerSecurityContext .Values.tls.securityContext) "context" $)  | nindent 12 -}}
           {{- end }}
           {{- if .Values.command }}
           command: {{- include "common.tplvalues.render" (dict "value" .Values.command "context" $) | nindent 12 }}
diff --git a/charts/testkube-enterprise/charts/minio/values.yaml b/charts/testkube-enterprise/charts/minio/values.yaml
index 25e942c9..f1fcf829 100644
--- a/charts/testkube-enterprise/charts/minio/values.yaml
+++ b/charts/testkube-enterprise/charts/minio/values.yaml
@@ -10,6 +10,8 @@
 ## @param global.imagePullSecrets Global Docker registry secret names as an array
 ## @param global.defaultStorageClass Global default StorageClass for Persistent Volume(s)
 ## @param global.storageClass DEPRECATED: use global.defaultStorageClass instead
+## @param global.containerSecurityContext Global Security Container Context
+## @param global.podSecurityContext Global Pod Container Context
 ##
 global:
   imageRegistry: ""
@@ -29,6 +31,8 @@ global:
       ## @param global.compatibility.openshift.adaptSecurityContext Adapt the securityContext sections of the deployment to make them compatible with Openshift restricted-v2 SCC: remove runAsUser, runAsGroup and fsGroup and let the platform use their allowed default IDs. Possible values: auto (apply if the detected running cluster is Openshift), force (perform the adaptation always), disabled (do not perform adaptation)
       ##
       adaptSecurityContext: auto
+  containerSecurityContext: {}
+  podSecurityContext: {}
 ## @section Common parameters
 
 ## @param nameOverride String to partially override common.names.fullname template (will maintain the release name)
diff --git a/charts/testkube-enterprise/charts/mongodb/values.yaml b/charts/testkube-enterprise/charts/mongodb/values.yaml
index aa3ec860..ef1619e0 100644
--- a/charts/testkube-enterprise/charts/mongodb/values.yaml
+++ b/charts/testkube-enterprise/charts/mongodb/values.yaml
@@ -12,6 +12,8 @@
 ## @param global.defaultStorageClass Global default StorageClass for Persistent Volume(s)
 ## @param global.storageClass DEPRECATED: use global.defaultStorageClass instead
 ## @param global.namespaceOverride Override the namespace for resource deployed by the chart, but can itself be overridden by the local namespaceOverride
+## @param global.containerSecurityContext Global Security Container Context
+## @param global.podSecurityContext Global Pod Container Context
 ##
 global:
   imageRegistry: ""