diff --git a/charts/stable/joplin-server/Chart.yaml b/charts/stable/joplin-server/Chart.yaml
index 25a4908bb57..413a267570f 100644
--- a/charts/stable/joplin-server/Chart.yaml
+++ b/charts/stable/joplin-server/Chart.yaml
@@ -1,7 +1,7 @@
 kubeVersion: ">=1.24.0-0"
 apiVersion: v2
 name: joplin-server
-version: 16.1.5
+version: 16.2.0
 appVersion: 2.14.1
 description: Allows you to sync any Joplin client.
 home: https://truecharts.org/charts/stable/joplin-server
diff --git a/charts/stable/joplin-server/questions.yaml b/charts/stable/joplin-server/questions.yaml
index 55b727028c8..fe50b9c0638 100644
--- a/charts/stable/joplin-server/questions.yaml
+++ b/charts/stable/joplin-server/questions.yaml
@@ -45,13 +45,21 @@ questions:
                                           show_if: [["MAILER_ENABLED", "=", 1]]
                                           type: int
                                           default: 465
-                                      - variable: MAILER_SECURE
+                                      - variable: tls
                                         label: Mailer Secure
                                         description: Enable SSL for SMTP
                                         schema:
                                           show_if: [["MAILER_ENABLED", "=", 1]]
-                                          type: boolean
-                                          default: true
+                                          type: string
+                                          default: tls
+                                          enum:
+                                            - value: tls
+                                              description: TLS
+                                            - value: starttls
+                                              description: StartTLS
+                                            - value: "none"
+                                              description: "None"
+
                                       - variable: MAILER_AUTH_USER
                                         label: Mailer Auth User
                                         description: Sets the username for the email server
diff --git a/charts/stable/joplin-server/values.yaml b/charts/stable/joplin-server/values.yaml
index 16aa2c5b5cd..c8db02a585e 100644
--- a/charts/stable/joplin-server/values.yaml
+++ b/charts/stable/joplin-server/values.yaml
@@ -45,7 +45,7 @@ workload:
             MAILER_ENABLED: 0
             MAILER_HOST: ""
             MAILER_PORT: 465
-            MAILER_SECURE: true
+            MAILER_SECURITY: tls
             MAILER_AUTH_USER: ""
             MAILER_AUTH_PASSWORD: ""
             MAILER_NOREPLY_NAME: ""