diff --git a/charts/stalwart-mail/Chart.yaml b/charts/stalwart-mail/Chart.yaml
index e63a40f..174dabe 100644
--- a/charts/stalwart-mail/Chart.yaml
+++ b/charts/stalwart-mail/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: stalwart-mail
 description: Stalwart is a JMAP, IMAP4 and SMTP server
-version: 0.1.2
+version: 0.1.3
 appVersion: 0.8.0
 maintainers:
 - name: Tommy Skaug
diff --git a/charts/stalwart-mail/templates/configuration.yaml b/charts/stalwart-mail/templates/configuration.yaml
index 17c8ca1..1bd2989 100644
--- a/charts/stalwart-mail/templates/configuration.yaml
+++ b/charts/stalwart-mail/templates/configuration.yaml
@@ -22,6 +22,10 @@ data:
     protocol = "imap"
     tls.implicit = true
 
+    [certificate."default"]
+    cert = "%{env:STALWART_TLS_CERT}%"
+    private-key = "%{env:STALWART_TLS_KEY}%"
+
     [store."rocksdb"]
     type = "rocksdb"
     path = "/data"
diff --git a/charts/stalwart-mail/templates/deployment.yaml b/charts/stalwart-mail/templates/deployment.yaml
index 6ddcada..aae1011 100644
--- a/charts/stalwart-mail/templates/deployment.yaml
+++ b/charts/stalwart-mail/templates/deployment.yaml
@@ -65,6 +65,16 @@ spec:
             secretKeyRef:
               name: {{ .Values.existingSecret }}
               key: STALWART_OAUTH_KEY
+        - name: STALWART_TLS_KEY
+          valueFrom:
+            secretKeyRef:
+              name: {{ .Values.tlsSecret }}
+              key: tls.key
+        - name: STALWART_TLS_CERT
+          valueFrom:
+            secretKeyRef:
+              name: {{ .Values.tlsSecret }}
+              key: tls.crt
         volumeMounts:
         - name: stalwart-data
           mountPath: /data
diff --git a/charts/stalwart-mail/templates/service.yaml b/charts/stalwart-mail/templates/service.yaml
index 6090508..e0a0c65 100644
--- a/charts/stalwart-mail/templates/service.yaml
+++ b/charts/stalwart-mail/templates/service.yaml
@@ -5,7 +5,6 @@ metadata:
   labels:
     {{- include "stalwart-mail.labels" . | nindent 4 }}
 spec:
-  type: {{ .Values.service.type }}
   ports:
   - name: http
     port: 8080
diff --git a/charts/stalwart-mail/values.yaml b/charts/stalwart-mail/values.yaml
index 2d7e85a..3957ce1 100644
--- a/charts/stalwart-mail/values.yaml
+++ b/charts/stalwart-mail/values.yaml
@@ -11,6 +11,7 @@ ldap:
     domains: "(&(|(objectClass=posixAccount)(objectClass=posixGroup))(|(mail=*@?)(mailAlias=*@?)))"
 
 existingSecret: stalwart-mail-secret
+tlsSecret: stalwart-mail-tls
 
 replicaCount: 1