diff --git a/README.md b/README.md
index 0ffba67..e107320 100644
--- a/README.md
+++ b/README.md
@@ -13,9 +13,9 @@ Feel free to pick your favourite distro.
   - [TL;DR](#tldr)
   - [Updates](#updates)
     - [v4.0.0](#v400)
-    - [v3.0.0](#v300)
+    - [v3.0.0](#v300)v
   - [Architectures](#architectures)
-  - [Configuration options](#configuration-options)
+  - [Configuration options](#configuration-options)k
     - [General options](#general-options)
       - [Inbound debugging](#inbound-debugging)
       - [`ALLOWED_SENDER_DOMAINS` and `ALLOW_EMPTY_SENDER_DOMAINS`](#allowed_sender_domains-and-allow_empty_sender_domains)
@@ -628,6 +628,7 @@ Chart configuration is as follows:
 | `service.spec` | `{}` | Additional service specifications |
 | `service.nodePort` | *empty* | Use a specific `nodePort` |
 | `service.nodeIP` | *empty* | Use a specific `nodeIP` |
+| `service.externalTrafficPolicy` | *empty* | Set `loadbalancer` [External traffic policy](https://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/#preserving-the-client-source-ip) |
 | `resources` | `{}` | [Pod resources](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) |
 | `autoscaling.enabled` | `false` | Set to `true` to enable [Horisontal Pod Autoscaler](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/) |
 | `autoscaling.minReplicas` | `1` | Minimum number of replicas |
diff --git a/helm/mail/templates/service.yaml b/helm/mail/templates/service.yaml
index 7f53d7a..ea133c4 100644
--- a/helm/mail/templates/service.yaml
+++ b/helm/mail/templates/service.yaml
@@ -14,6 +14,9 @@ metadata:
     {{- with .Values.service.annotations }}{{ toYaml . | nindent 4 }}{{ end }}
 spec:
   type: {{ .Values.service.type }}
+  {{- if .Values.externalTrafficPolicy }}
+  externalTrafficPolicy: {{ .Values.externalTrafficPolicy }}
+  {{- end }}
   {{- with .Values.service.spec }}{{ toYaml . | nindent 2 }}{{ end }}
   ports:
     - port: {{ .Values.service.port }}
diff --git a/helm/mail/values.yaml b/helm/mail/values.yaml
index c22de88..4917bad 100644
--- a/helm/mail/values.yaml
+++ b/helm/mail/values.yaml
@@ -19,6 +19,7 @@ service:
   port: 587
   labels: {}
   annotations: {}
+  # externalTrafficPolicy: Cluster
   # nodePort:
 
 # StatefulSets now require a headless service
@@ -84,7 +85,8 @@ metrics:
 # a pod and let `StatefulSet` recreate it.
 recreateOnRedeploy: true
 
-resources: {}
+resources:
+  {}
   # We usually recommend not to specify default resources and to leave this as a conscious
   # choice for the user. This also increases chances charts run on environments with little
   # resources, such as Minikube. If you do want to specify resources, uncomment the following
@@ -154,7 +156,8 @@ existingSecret: ""
 mountSecret:
   enabled: false
   path: /var/lib/secret
-  data: {}
+  data:
+    {}
     # e.g.
     # dkim-private: |
     #   -----BEGIN RSA PRIVATE KEY-----
@@ -162,7 +165,8 @@ mountSecret:
     #   -----END RSA PRIVATE KEY-----
 
 config:
-  general: {}
+  general:
+    {}
     # e.g.
     # TZ:
     # FORCE_COLOR:
@@ -178,18 +182,21 @@ config:
     # SMTP_HEADER_CHECKS:
     # DKIM_SELECTOR:
     # DKIM_AUTOGENERATE:
-  postfix: {}
+  postfix:
+    {}
     # e.g.
     # myhostname: "postfix"
     # smtp_tls_security_level: "encrypt"
-  opendkim: {}
+  opendkim:
+    {}
     # e.g.
     # RequireSafeKeys: "yes"
 
 dns:
   policy: ""
   # policy: "None"
-  nameservers: {}
+  nameservers:
+    {}
     # - 8.8.8.8
     # - 8.8.4.4
   searches: ""