diff --git a/charts/authelia/Chart.yaml b/charts/authelia/Chart.yaml
index 3029473..c98e9b1 100644
--- a/charts/authelia/Chart.yaml
+++ b/charts/authelia/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: authelia
-version: 0.1.12
+version: 0.1.13
 kubeVersion: ">= 1.13.0"
 description: Authelia is a Single Sign-On Multi-Factor portal for web apps
 type: application
diff --git a/charts/authelia/templates/deployment.yaml b/charts/authelia/templates/deployment.yaml
index 8476831..05169a4 100644
--- a/charts/authelia/templates/deployment.yaml
+++ b/charts/authelia/templates/deployment.yaml
@@ -88,6 +88,10 @@ spec:
             - name: AUTHELIA_AUTHENTICATION_BACKEND_LDAP_PASSWORD_FILE
               value: /usr/app/secrets/LDAP_PASSWORD
             {{- end }}
+            {{- if or (include "authelia.configured.smtp" .) (include "authelia.configured.smtpSecret" .) }}
+            - name: AUTHELIA_NOTIFIER_SMTP_PASSWORD_FILE
+              value: /usr/app/secrets/SMTP_PASSWORD
+            {{- end }}
             {{- if .Values.configMap.storage.postgres }}
             - name: AUTHELIA_STORAGE_POSTGRES_PASSWORD_FILE
               value: /usr/app/secrets/STORAGE_PASSWORD
@@ -188,11 +192,11 @@ spec:
               - key: {{ default "LDAP_PASSWORD" .Values.secret.ldap.key }}
                 path: LDAP_PASSWORD
               {{- end }}
-              {{- if .Values.secret.smtp.enabled }}
+              {{- if or (include "authelia.configured.smtp" .) (include "authelia.configured.smtpSecret" .) }}
               - key: {{ default "SMTP_PASSWORD" .Values.secret.smtp.key }}
                 path: SMTP_PASSWORD
               {{- end }}
-              {{- if and (.Values.configMap.session.redis) (.Values.secret.redis.enabled) }}
+              {{- if and (include "authelia.configured.redisSecret" .) (include "authelia.configured.redis" .) }}
               - key: {{ default "REDIS_PASSWORD" .Values.secret.redis.key }}
                 path: REDIS_PASSWORD
               {{- end }}