diff --git a/bitnami/mysql/Chart.yaml b/bitnami/mysql/Chart.yaml
index 303928813..9e0e37935 100644
--- a/bitnami/mysql/Chart.yaml
+++ b/bitnami/mysql/Chart.yaml
@@ -1,5 +1,5 @@
 name: mysql
-version: 1.1.3
+version: 2.0.0
 appVersion: 5.7.22-debian-9
 description: Chart to create a Highly available MySQL cluster
 keywords:
diff --git a/bitnami/mysql/templates/master-statefulset.yaml b/bitnami/mysql/templates/master-statefulset.yaml
index b96ef94c5..06663566d 100644
--- a/bitnami/mysql/templates/master-statefulset.yaml
+++ b/bitnami/mysql/templates/master-statefulset.yaml
@@ -20,6 +20,11 @@ spec:
         component: "master"
         release: "{{ .Release.Name }}"
     spec:
+      {{- if .Values.securityContext.enabled }}
+      securityContext:
+        fsGroup: {{ .Values.securityContext.fsGroup }}
+        runAsUser: {{ .Values.securityContext.runAsUser }}
+      {{- end }}
       {{- if eq .Values.master.antiAffinity "hard" }}
       affinity:
         podAntiAffinity:
diff --git a/bitnami/mysql/templates/slave-statefulset.yaml b/bitnami/mysql/templates/slave-statefulset.yaml
index 672f47f16..5196a3909 100644
--- a/bitnami/mysql/templates/slave-statefulset.yaml
+++ b/bitnami/mysql/templates/slave-statefulset.yaml
@@ -21,6 +21,11 @@ spec:
         component: "slave"
         release: "{{ .Release.Name }}"
     spec:
+      {{- if .Values.securityContext.enabled }}
+      securityContext:
+        fsGroup: {{ .Values.securityContext.fsGroup }}
+        runAsUser: {{ .Values.securityContext.runAsUser }}
+      {{- end }}
       {{- if eq .Values.slave.antiAffinity "hard" }}
       affinity:
         podAntiAffinity:
@@ -77,7 +82,7 @@ spec:
           value: "3306"
         - name: MYSQL_MASTER_USER
           value: "root"
-        - name: MYSQL_MASTER_PASSWORD
+        - name: MYSQL_MASTER_ROOT_PASSWORD
           valueFrom:
             secretKeyRef:
               name: {{ template "fullname" . }}
diff --git a/bitnami/mysql/values-production.yaml b/bitnami/mysql/values-production.yaml
index 63c2cb8f8..d23a49d66 100644
--- a/bitnami/mysql/values-production.yaml
+++ b/bitnami/mysql/values-production.yaml
@@ -3,7 +3,7 @@
 ##
 image:
   registry: docker.io
-  repository: bitnami/mariadb
+  repository: bitnami/mysql
   tag: 5.7.22-debian-9
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
@@ -22,6 +22,14 @@ service:
   type: ClusterIP
   port: 3306
 
+## Pod Security Context
+## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
+##
+securityContext:
+  enabled: true
+  fsGroup: 1001
+  runAsUser: 1001
+
 root:
   ## MySQL admin password
   ## ref: https://github.com/bitnami/bitnami-docker-mysql#setting-the-root-password-on-first-run
diff --git a/bitnami/mysql/values.yaml b/bitnami/mysql/values.yaml
index 192295ee6..25dce11f4 100644
--- a/bitnami/mysql/values.yaml
+++ b/bitnami/mysql/values.yaml
@@ -23,6 +23,14 @@ service:
   type: ClusterIP
   port: 3306
 
+## Pod Security Context
+## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
+##
+securityContext:
+  enabled: true
+  fsGroup: 1001
+  runAsUser: 1001
+
 root:
   ## MySQL admin password
   ## ref: https://github.com/bitnami/bitnami-docker-mysql#setting-the-root-password-on-first-run