diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6043323..cf52786 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
 variables:
-  HELM_CHART_VERSION: "99.6.25"
+  HELM_CHART_VERSION: "99.6.26"
 
 stages:
   - deploy
diff --git a/Chart/templates/configmap.yaml b/Chart/templates/configmap.yaml
index 7056cdd..72049c1 100644
--- a/Chart/templates/configmap.yaml
+++ b/Chart/templates/configmap.yaml
@@ -5,7 +5,11 @@ metadata:
     labels:
         {{- include "..labels" . | nindent 8 }}
 data:
+    {{- if eq (.Values.email.smtpServer | default "smtp2go" ) "smtp2go" }}
     SMTP_PORT: '2525'
+    {{- else }}
+    SMTP_PORT: '25'
+    {{- end }}
     SMTP_AUTH: 'true'
     SMTP_FROM: 'customer-noreply@v3.nu'
         {{- if .Values.email }}