diff --git a/charts/portkey-app/templates/clickhouse/secrets.yaml b/charts/portkey-app/templates/clickhouse/secrets.yaml
index 012f44f..c202d23 100644
--- a/charts/portkey-app/templates/clickhouse/secrets.yaml
+++ b/charts/portkey-app/templates/clickhouse/secrets.yaml
@@ -11,7 +11,7 @@ data:
   store: {{ default "clickhouse" .Values.clickhouse.store | b64enc }}
   {{- if .Values.clickhouse.external.enabled }}
   clickhouse_user: {{ .Values.clickhouse.external.user | b64enc }}
-  clickhouse_password: {{ .Values.clickhouse.external.password | b64enc }}
+  clickhouse_password: {{ .Values.clickhouse.external.password | b64enc | quote }}
   clickhouse_host: {{ .Values.clickhouse.external.host | b64enc }}
   clickhouse_port: {{ .Values.clickhouse.external.port | b64enc }}
   clickhouse_native_port: {{ .Values.clickhouse.external.nativePort | b64enc }}
@@ -22,7 +22,7 @@ data:
   clickhouse_cluster_name: {{ .Values.clickhouse.external.clusterName | b64enc }}
   {{- else }}
   clickhouse_user: {{ .Values.clickhouse.external.user | b64enc }}
-  clickhouse_password: {{ .Values.clickhouse.external.password | b64enc }}
+  clickhouse_password: {{ .Values.clickhouse.external.password | b64enc | quote }}
   clickhouse_host: {{ printf "%s-%s" (include "portkey.fullname" .) .Values.clickhouse.name | b64enc }}
   clickhouse_port: {{ toString .Values.clickhouse.containerHttpPort | b64enc }}
   clickhouse_native_port: {{ toString .Values.clickhouse.containerNativePort | b64enc }}
diff --git a/charts/portkey-app/templates/mysql/stateful-set.yaml b/charts/portkey-app/templates/mysql/stateful-set.yaml
index d490f63..31d2f2d 100644
--- a/charts/portkey-app/templates/mysql/stateful-set.yaml
+++ b/charts/portkey-app/templates/mysql/stateful-set.yaml
@@ -105,9 +105,6 @@ spec:
             {{- toYaml .Values.mysql.statefulSet.securityContext | nindent 12 }}
           {{- if .Values.mysql.statefulSet.persistence.enabled }}
           volumeMounts:
-            {{- with .Values.clickhouse.statefulSet.volumeMounts }}
-              {{- toYaml . | nindent 12 }}
-            {{- end }}
             - mountPath: /var/lib/mysql
               name: data
             {{- with .Values.mysql.statefulSet.volumeMounts }}