diff --git a/charts/mailproxy/v0.1.0/templates/mailauth-deployment.yaml b/charts/mailproxy/v0.1.0/templates/mailauth-deployment.yaml
index 40f8448..08188ff 100644
--- a/charts/mailproxy/v0.1.0/templates/mailauth-deployment.yaml
+++ b/charts/mailproxy/v0.1.0/templates/mailauth-deployment.yaml
@@ -57,10 +57,22 @@ spec:
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.affinity }}
       affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+            - weight: 100
+              podAffinityTerm:
+                labelSelector:
+                  matchExpressions:
+                    - key: app.kubernetes.io/name
+                      operator: In
+                      values:
+                        - {{ include "mailproxy.name" . }}
+                    - key: app.kubernetes.io/instance
+                      operator: In
+                      values:
+                        - {{ .Release.Name }}
+                topologyKey: "kubernetes.io/hostname"
       {{- with .Values.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}