diff --git a/charts/mastodon/templates/secrets.yaml b/charts/mastodon/templates/secrets.yaml
index 0daf1b62d579c0a524f1146dbc6234cc45f85d27..84d7fcc065b4806e2d942e58eae63bdb275c1e55 100644
--- a/charts/mastodon/templates/secrets.yaml
+++ b/charts/mastodon/templates/secrets.yaml
@@ -41,16 +41,19 @@ data:
   {{- end }}
   {{- end }}
   {{- if .Values.externalAuth.oidc.enabled }}
-  OIDC_CLIENT_SECRET: {{ .Values.externalAuth.oidc.client_secret }}
+  OIDC_CLIENT_SECRET: {{ .Values.externalAuth.oidc.client_secret  | b64enc }}
   {{- end }}
   {{- if .Values.externalAuth.saml.enabled }}
   {{- with .Values.externalAuth.saml.private_key }}
-  SAML_PRIVATE_KEY: {{ . | quote }}
+  SAML_PRIVATE_KEY: {{ .  | b64enc | quote }}
   {{- end }}
   {{- end }}
   {{- if .Values.externalAuth.ldap.enabled }}
   {{- with .Values.externalAuth.ldap.password }}
-  LDAP_PASSWORD: {{ . }}
+  LDAP_PASSWORD: {{ .  | b64enc }}
   {{- end }}
   {{- end }}
+  {{- with .Values.mastodon.smtp.password }}
+  SMTP_PASSWORD: {{ . | b64enc }}
+  {{- end }}
 {{- end }}