diff --git a/stalwart-mail/Chart.yaml b/stalwart-mail/Chart.yaml
index bc012c9..02ee721 100644
--- a/stalwart-mail/Chart.yaml
+++ b/stalwart-mail/Chart.yaml
@@ -3,7 +3,7 @@ name: stalwart-mail
 description: Helm Chart for Stalwart Mail Server - Secure & Modern All-in-One Mail Server (IMAP, JMAP, SMTP)
 icon: https://stalw.art/home/apple-touch-icon.png
 type: application
-version: 0.0.5
+version: 0.0.6
 # renovate: image=docker.io/stalwartlabs/mail-server
 appVersion: "0.8.1"
 maintainers:
diff --git a/stalwart-mail/README.adoc b/stalwart-mail/README.adoc
index 446c7f7..ae49b67 100644
--- a/stalwart-mail/README.adoc
+++ b/stalwart-mail/README.adoc
@@ -2,7 +2,7 @@
 
 = stalwart-mail
 
-image::https://img.shields.io/badge/Version-0.0.5-informational?style=flat-square[Version: 0.0.5]
+image::https://img.shields.io/badge/Version-0.0.6-informational?style=flat-square[Version: 0.0.6]
 image::https://img.shields.io/badge/Version-application-informational?style=flat-square[Type: application]
 image::https://img.shields.io/badge/AppVersion-0.8.1-informational?style=flat-square[AppVersion: 0.8.1]
 == Maintainers
@@ -161,7 +161,7 @@ helm uninstall stalwart-mail-release
 
 | config.server.listener.https.bind[0]
 | string
-| `"[::]:80"`
+| `"[::]:443"`
 |
 
 | config.server.listener.https.protocol
@@ -199,6 +199,31 @@ helm uninstall stalwart-mail-release
 | `true`
 |
 
+| config.server.listener.pop3.bind[0]
+| string
+| `"[::]:110"`
+|
+
+| config.server.listener.pop3.protocol
+| string
+| `"pop3"`
+|
+
+| config.server.listener.pop3s.bind[0]
+| string
+| `"[::]:995"`
+|
+
+| config.server.listener.pop3s.protocol
+| string
+| `"pop3"`
+|
+
+| config.server.listener.pop3s.tls.implicit
+| bool
+| `true`
+|
+
 | config.server.listener.sieve.bind[0]
 | string
 | `"[::]:4190"`
@@ -244,16 +269,6 @@ helm uninstall stalwart-mail-release
 | `true`
 |
 
-| config.server.run-as.group
-| string
-| `"stalwart-mail"`
-| server run-as group
-
-| config.server.run-as.user
-| string
-| `"stalwart-mail"`
-| server run-as user
-
 | config.storage.blob
 | string
 | `"rocksdb"`
@@ -514,9 +529,9 @@ helm uninstall stalwart-mail-release
 | `"SingleStack"`
 | other option is RequireDualStack
 
-| service.ports.http
+| service.ports.https
 | int
-| `80`
+| `443`
 |
 
 | service.ports.imap
@@ -524,11 +539,21 @@ helm uninstall stalwart-mail-release
 | `143`
 |
 
-| service.ports.imaps
+| service.ports.imaptls
 | int
 | `993`
 |
 
+| service.ports.pop3
+| int
+| `110`
+|
+
+| service.ports.pop3s
+| int
+| `995`
+|
+
 | service.ports.sieve
 | int
 | `4190`
@@ -584,16 +609,31 @@ helm uninstall stalwart-mail-release
 | `false`
 |
 
-| traefik.ports.http
+| traefik.ports.https
 | string
 | `"websecure"`
 |
 
-| traefik.ports.imaps
+| traefik.ports.imaptls
 | string
 | `"imaps"`
 |
 
+| traefik.ports.pop3s
+| string
+| `"pop3s"`
+|
+
+| traefik.ports.sieve
+| string
+| `"sieve"`
+|
+
+| traefik.ports.smtp
+| string
+| `"smtp"`
+|
+
 | traefik.ports.smtps
 | string
 | `"smtps"`
diff --git a/stalwart-mail/values.yaml b/stalwart-mail/values.yaml
index 142ecdf..8ca9aef 100644
--- a/stalwart-mail/values.yaml
+++ b/stalwart-mail/values.yaml
@@ -43,23 +43,23 @@ config:
         protocol: "imap"
         tls:
           implicit: true
-
+      pop3:
+        bind: ["[::]:110"]
+        protocol: "pop3"
+      pop3s:
+        bind: ["[::]:995"]
+        protocol: "pop3"
+        tls:
+          implicit: true
       sieve:
         bind: ["[::]:4190"]
         protocol: "managesieve"
-
       https:
         protocol: "http"
-        bind: ["[::]:80"]
+        bind: ["[::]:443"]
         tls:
           implicit: true
 
-    run-as:
-      # -- server run-as user
-      user: "stalwart-mail"
-      # -- server run-as group
-      group: "stalwart-mail"
-
   storage:
     data: "rocksdb"
     fts: "rocksdb"
@@ -159,9 +159,11 @@ service:
     smtp-submission: 587
     smtps: 465
     imap: 143
-    imaps: 993
+    imaptls: 993
+    pop3: 110
+    pop3s: 995
     sieve: 4190
-    http: 80
+    https: 443
 
 ingress:
   enabled: false
@@ -182,9 +184,12 @@ ingress:
 traefik:
   enabled: false
   ports:
-    http: websecure
-    imaps: imaps
+    smtp: smtp
     smtps: smtps
+    imaptls: imaps
+    pop3s: pop3s
+    sieve: sieve
+    https: websecure
 
 certificate:
   # -- not needed if certmanager is used