diff --git a/charts/docker-mailserver/Chart.yaml b/charts/docker-mailserver/Chart.yaml
index fd66c6f2..37ec7a31 100644
--- a/charts/docker-mailserver/Chart.yaml
+++ b/charts/docker-mailserver/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "6.3.0"
 description: A fullstack but simple mailserver (smtp, imap, antispam, antivirus, ssl...) using Docker.
 name: docker-mailserver
-version: 0.2.2-dev4
+version: 0.2.2-dev5
 sources:
 - https://github.com/funkypenguin/docker-mailserver
 maintainers:
diff --git a/charts/docker-mailserver/templates/deployment.yaml b/charts/docker-mailserver/templates/deployment.yaml
index 765789f1..5cb2d9e6 100644
--- a/charts/docker-mailserver/templates/deployment.yaml
+++ b/charts/docker-mailserver/templates/deployment.yaml
@@ -71,7 +71,7 @@ spec:
           resources:
 {{ toYaml .Values.resources | indent 12 }}
           securityContext:
-            privileged: {{ default false .Values.pod.dockermailserver.securityContext.privileged }}
+{{ toYaml .Values.pod.dockermailserver.securityContext | indent 12 }}
             {{- if eq .Values.pod.dockermailserver.enable_fail2ban 1.0 }}
             capabilities:
               add:
diff --git a/charts/docker-mailserver/values.yaml b/charts/docker-mailserver/values.yaml
index 28ebb48d..4fe00825 100644
--- a/charts/docker-mailserver/values.yaml
+++ b/charts/docker-mailserver/values.yaml
@@ -118,7 +118,9 @@ pod:
       ## pod.dockermailserver.securityContext defines whether the container should be run in "privileged" mode (essentially, root on the host)
       ## Ref: http://kubernetes.io/docs/api-reference/v1/definitions/#_v1_securitycontext
       ## Default: false
-      privileged:
+      privileged: false
+      runAsUser: 10001
+      runAsGroup: 10001
 
     ## The following variables affect the behaviour of docker-mailserver
     ## See https://github.com/tomav/docker-mailserver#environment-variables for details