diff --git a/stable/testlink/Chart.yaml b/stable/testlink/Chart.yaml
index b465e05dbc..30bea1c150 100644
--- a/stable/testlink/Chart.yaml
+++ b/stable/testlink/Chart.yaml
@@ -1,5 +1,5 @@
 name: testlink
-version: 0.4.16
+version: 0.4.17
 appVersion: 1.9.16
 description: Web-based test management system that facilitates software quality assurance.
 icon: https://bitnami.com/assets/stacks/testlink/img/testlink-stack-220x234.png
diff --git a/stable/testlink/templates/deployment.yaml b/stable/testlink/templates/deployment.yaml
index 309941e4c6..a5cde7b023 100644
--- a/stable/testlink/templates/deployment.yaml
+++ b/stable/testlink/templates/deployment.yaml
@@ -40,15 +40,15 @@ spec:
         - name: TESTLINK_LANGUAGE
           value: {{ default "" .Values.testlinkLanguage | quote }}
         - name: SMTP_ENABLE
-          value: {{ default "" .Values.smtpEnable | quote }}
+          value: {{ .Values.smtpEnable | quote }}
         - name: SMTP_CONNECTION_MODE
-          value: {{ default "" .Values.smtpConnectionMode | quote }}
+          value: {{ .Values.smtpConnectionMode | quote }}
         - name: SMTP_HOST
-          value: {{ default "" .Values.smtpHost | quote }}
+          value: {{ .Values.smtpHost | quote }}
         - name: SMTP_PORT
-          value: {{ default "" .Values.smtpPort | quote }}
+          value: {{ .Values.smtpPort | quote }}
         - name: SMTP_USER
-          value: {{ default "" .Values.smtpUser | quote }}
+          value: {{ .Values.smtpUser | quote }}
         - name: SMTP_PASSWORD
           valueFrom:
             secretKeyRef:
diff --git a/stable/testlink/values.yaml b/stable/testlink/values.yaml
index 87907ee5e8..5179d675d2 100644
--- a/stable/testlink/values.yaml
+++ b/stable/testlink/values.yaml
@@ -33,12 +33,12 @@ testlinkLanguage: en_US
 ## SMTP mail delivery configuration
 ## ref: https://github.com/bitnami/bitnami-docker-testlink#smtp-configuration
 ##
-# smtpEnable: true
-# smtpHost: smtp.example.com
-# smtpPort: 587
-# smtpUser: mailer@example.com
-# smtpPassword: mailerpassword
-# smtpConnectionMode: tls
+smtpEnable: false
+smtpHost:
+smtpPort:
+smtpUser:
+smtpPassword:
+smtpConnectionMode:
 
 ##
 ## MariaDB chart configuration