diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a6bafb0..71d7cfe 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
 variables:
-  HELM_CHART_VERSION: "99.6.20"
+  HELM_CHART_VERSION: "99.6.21"
 
 stages:
   - deploy
diff --git a/Chart/templates/externalsecret.yaml b/Chart/templates/externalsecret.yaml
index 6dc53cb..73acfa4 100644
--- a/Chart/templates/externalsecret.yaml
+++ b/Chart/templates/externalsecret.yaml
@@ -20,6 +20,7 @@ spec:
     - secretKey: COMPOSER_AUTH
       remoteRef:
         key: secret/GITLAB-COMPOSER-AUTH
+    {{- if eq (.Values.email.smtpServer | default "smtp2go" ) "smtp2go" }}
     - secretKey: SMTP_USER
       remoteRef:
         key: secret/SMTP-USER
@@ -29,6 +30,17 @@ spec:
     - secretKey: SMTP_HOST
       remoteRef:
         key: secret/SMTP-HOST
+    {{- else }}
+    - secretKey: SMTP_USER
+      remoteRef:
+        key: secret/AWS-SMTP-USER
+    - secretKey: SMTP_PASS
+      remoteRef:
+        key: secret/AWS-SMTP-PASSWORD
+    - secretRef: SMTP_HOST
+      remoteRef:
+        key: secret/AWS-SMTP-HOST
+    {{- end }}
     - secretKey: WPC_REGISTRATION_SECRET
       remoteRef:
         key: secret/WPC-REGISTRATION-SECRET
diff --git a/Chart/values.yaml b/Chart/values.yaml
index 20b4f6e..0922a0d 100644
--- a/Chart/values.yaml
+++ b/Chart/values.yaml
@@ -24,6 +24,8 @@ email:
     # - customer.tld
   # emails:
     # - mail@customer.tld
+  # Set the SMTP server to use for the site
+  smtpServer: smtp2go
 
 # Database configuration
 database: