diff --git a/charts/nextcloud/Chart.yaml b/charts/nextcloud/Chart.yaml
index 7fb726af..cd03a53c 100644
--- a/charts/nextcloud/Chart.yaml
+++ b/charts/nextcloud/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: nextcloud
-version: 2.5.0
+version: 2.5.1
 appVersion: 19.0.3
 description: A file sharing server that puts the control and security of your own data back into your hands.
 keywords:
diff --git a/charts/nextcloud/README.md b/charts/nextcloud/README.md
index 848ffbfd..1ec07cd6 100644
--- a/charts/nextcloud/README.md
+++ b/charts/nextcloud/README.md
@@ -65,6 +65,8 @@ The following table lists the configurable parameters of the nextcloud chart and
 | `nextcloud.existingSecret.secretName`                        | Name of the existing secret                             | `nil`                                       |
 | `nextcloud.existingSecret.usernameKey`                       | Name of the key that contains the username              | `nil`                                       |
 | `nextcloud.existingSecret.passwordKey`                       | Name of the key that contains the password              | `nil`                                       |
+| `nextcloud.existingSecret.smtpUsernameKey`                       | Name of the key that contains the SMTP username         | `nil`                                       |
+| `nextcloud.existingSecret.smtpPasswordKey`                       | Name of the key that contains the SMTP password         | `nil`                                       |
 | `nextcloud.update`                                           | Trigger update if custom command is used                | `0`                                         |
 | `nextcloud.datadir`                                          | nextcloud data dir location                             | `/var/www/html/data`                        |
 | `nextcloud.tableprefix`                                      | nextcloud db table prefix                               | `''`                                        |
diff --git a/charts/nextcloud/templates/deployment.yaml b/charts/nextcloud/templates/deployment.yaml
index 6f9dd243..434e4a0e 100644
--- a/charts/nextcloud/templates/deployment.yaml
+++ b/charts/nextcloud/templates/deployment.yaml
@@ -150,13 +150,13 @@ spec:
         - name: SMTP_NAME
           valueFrom:
             secretKeyRef:
-              name: {{ template "nextcloud.fullname" . }}
-              key: smtp-username
+              name: {{ .Values.nextcloud.existingSecret.secretName | default (include "nextcloud.fullname" .) }}
+              key: {{ .Values.nextcloud.existingSecret.smtpUsernameKey | default "smtp-username" }}
         - name: SMTP_PASSWORD
           valueFrom:
             secretKeyRef:
-              name: {{ template "nextcloud.fullname" . }}
-              key: smtp-password
+              name: {{ .Values.nextcloud.existingSecret.secretName | default (include "nextcloud.fullname" .) }}
+              key: {{ .Values.nextcloud.existingSecret.smtpPasswordKey | default "smtp-password" }}
         {{- end }}
         {{- if .Values.redis.enabled }}
         - name: REDIS_HOST
diff --git a/charts/nextcloud/values.yaml b/charts/nextcloud/values.yaml
index a3727d24..8403a017 100644
--- a/charts/nextcloud/values.yaml
+++ b/charts/nextcloud/values.yaml
@@ -70,6 +70,8 @@ nextcloud:
     # secretName: nameofsecret
     # usernameKey: username
     # passwordKey: password
+    # smtpUsernameKey: smtp_username
+    # smtpPasswordKey: smtp_password
   update: 0
   datadir: /var/www/html/data
   tableprefix: