diff --git a/charts/mastodon/templates/configmap-env.yaml b/charts/mastodon/templates/configmap-env.yaml
index b38e3fe685418aea08a01a333dd7c9beefb38a3f..7c94bb93ae61d976414e15f5b3c32b1200333013 100644
--- a/charts/mastodon/templates/configmap-env.yaml
+++ b/charts/mastodon/templates/configmap-env.yaml
@@ -78,9 +78,6 @@ data:
   {{- with .Values.mastodon.smtp.openssl_verify_mode }}
   SMTP_OPENSSL_VERIFY_MODE: {{ . }}
   {{- end }}
-  {{- with .Values.mastodon.smtp.password }}
-  SMTP_PASSWORD: {{ . }}
-  {{- end }}
   {{- with .Values.mastodon.smtp.port }}
   SMTP_PORT: {{ . | quote }}
   {{- end }}
@@ -105,7 +102,6 @@ data:
   OIDC_SCOPE: {{ .Values.externalAuth.oidc.scope | quote }}
   OIDC_UID_FIELD: {{ .Values.externalAuth.oidc.uid_field }}
   OIDC_CLIENT_ID: {{ .Values.externalAuth.oidc.client_id }}
-  OIDC_CLIENT_SECRET: {{ .Values.externalAuth.oidc.client_secret }}
   OIDC_REDIRECT_URI: {{ .Values.externalAuth.oidc.redirect_uri }}
   OIDC_SECURITY_ASSUME_EMAIL_IS_VERIFIED: {{ .Values.externalAuth.oidc.assume_email_is_verified | quote }}
   {{- with .Values.externalAuth.oidc.client_auth_method }}
@@ -172,9 +168,6 @@ data:
   {{- with .Values.externalAuth.saml.cert }}
   SAML_CERT: {{ . | quote }}
   {{- end }}
-  {{- with .Values.externalAuth.saml.private_key }}
-  SAML_PRIVATE_KEY: {{ . | quote }}
-  {{- end }}
   {{- with .Values.externalAuth.saml.want_assertion_signed }}
   SAML_SECURITY_WANT_ASSERTION_SIGNED: {{ . | quote }}
   {{- end }}
@@ -293,9 +286,6 @@ data:
   {{- with .Values.externalAuth.ldap.bind_on }}
   LDAP_BIND_ON: {{ . }}
   {{- end }}
-  {{- with .Values.externalAuth.ldap.password }}
-  LDAP_PASSWORD: {{ . }}
-  {{- end }}
   {{- with .Values.externalAuth.ldap.uid }}
   LDAP_UID: {{ . }}
   {{- end }}
diff --git a/charts/mastodon/templates/deployment-streaming.yaml b/charts/mastodon/templates/deployment-streaming.yaml
index dd804044c97172ad17e52ded8f0240f1a806d6ae..bec303cf952631025058d32a85b2ebdb287e62aa 100644
--- a/charts/mastodon/templates/deployment-streaming.yaml
+++ b/charts/mastodon/templates/deployment-streaming.yaml
@@ -45,6 +45,8 @@ spec:
           envFrom:
             - configMapRef:
                 name: {{ include "mastodon.fullname" . }}-env
+            - secretRef:
+                name: {{ template "mastodon.secretName" . }}
           env:
             - name: "DB_PASS"
               valueFrom:
diff --git a/charts/mastodon/templates/secrets.yaml b/charts/mastodon/templates/secrets.yaml
index d1776ac590b6ce57e1a2bd5a779aec68f593045a..0daf1b62d579c0a524f1146dbc6234cc45f85d27 100644
--- a/charts/mastodon/templates/secrets.yaml
+++ b/charts/mastodon/templates/secrets.yaml
@@ -40,4 +40,17 @@ data:
   password: "{{ .Values.postgresql.auth.password | b64enc }}"
   {{- end }}
   {{- end }}
+  {{- if .Values.externalAuth.oidc.enabled }}
+  OIDC_CLIENT_SECRET: {{ .Values.externalAuth.oidc.client_secret }}
+  {{- end }}
+  {{- if .Values.externalAuth.saml.enabled }}
+  {{- with .Values.externalAuth.saml.private_key }}
+  SAML_PRIVATE_KEY: {{ . | quote }}
+  {{- end }}
+  {{- end }}
+  {{- if .Values.externalAuth.ldap.enabled }}
+  {{- with .Values.externalAuth.ldap.password }}
+  LDAP_PASSWORD: {{ . }}
+  {{- end }}
+  {{- end }}
 {{- end }}