diff --git a/cadence/Chart.yaml b/cadence/Chart.yaml
index ca8ac6b6..8b73dd3e 100644
--- a/cadence/Chart.yaml
+++ b/cadence/Chart.yaml
@@ -1,5 +1,5 @@
 name: cadence
-version: 0.21.3
+version: 0.21.4
 appVersion: 0.21.3
 description: Cadence is a distributed, scalable, durable, and highly available orchestration engine to execute asynchronous long-running business logic in a scalable and resilient way.
 icon: https://raw.githubusercontent.com/uber/cadence-web/master/client/assets/logo.svg
diff --git a/cadence/templates/server-job.yaml b/cadence/templates/server-job.yaml
index b0706ab5..0dfeafc3 100644
--- a/cadence/templates/server-job.yaml
+++ b/cadence/templates/server-job.yaml
@@ -110,7 +110,14 @@ spec:
             - name: SQL_USER
               value: {{ include "cadence.persistence.sql.user" (list $ $store) }}
             - name: SQL_PASSWORD
+              {{- if .Values.mysql.enabled }}
+              valueFrom:
+                secretKeyRef:
+                  name: {{ include "cadence.persistence.secretName" (list $ $store) | quote }}
+                  key: {{ include "cadence.persistence.secretKey" (list $ $store) | quote }}
+              {{- else -}}
               value: {{ include "cadence.persistence.sql.password" (list $ $store) }}
+              {{- end -}}
             {{- with $storeConfig.sql.connectAttributes }}
             - name: SQL_CONNECT_ATTRIBUTES
               value: {{ include "to-query" . }}
@@ -158,7 +165,14 @@ spec:
             - name: SQL_USER
               value: {{ include "cadence.persistence.sql.user" (list $ $store) }}
             - name: SQL_PASSWORD
+              {{- if .Values.mysql.enabled }}
+              valueFrom:
+                secretKeyRef:
+                  name: {{ include "cadence.persistence.secretName" (list $ $store) | quote }}
+                  key: {{ include "cadence.persistence.secretKey" (list $ $store) | quote }}
+              {{- else -}}
               value: {{ include "cadence.persistence.sql.password" (list $ $store) }}
+              {{- end -}}
             {{- with $storeConfig.sql.connectAttributes }}
             - name: SQL_CONNECT_ATTRIBUTES
               value: {{ include "to-query" . }}
@@ -282,7 +296,14 @@ spec:
             - name: SQL_USER
               value: {{ include "cadence.persistence.sql.user" (list $ $store) }}
             - name: SQL_PASSWORD
+              {{- if .Values.mysql.enabled }}
+              valueFrom:
+                secretKeyRef:
+                  name: {{ include "cadence.persistence.secretName" (list $ $store) | quote }}
+                  key: {{ include "cadence.persistence.secretKey" (list $ $store) | quote }}
+              {{- else -}}
               value: {{ include "cadence.persistence.sql.password" (list $ $store) }}
+              {{- end -}}
             {{- with $storeConfig.sql.connectAttributes }}
             - name: SQL_CONNECT_ATTRIBUTES
               value: {{ include "to-query" . }}