diff --git a/zammad/Chart.yaml b/zammad/Chart.yaml
index 0c46c78..01c76ab 100755
--- a/zammad/Chart.yaml
+++ b/zammad/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: zammad
-version: 14.1.3
+version: 14.2.0
 appVersion: 6.5.0-75
 description: Zammad is a web based open source helpdesk/customer support system with many features to manage customer communication via several channels like telephone, facebook, twitter, chat and e-mails.
 home: https://zammad.org
diff --git a/zammad/templates/deployment-nginx.yaml b/zammad/templates/deployment-nginx.yaml
index 307e4a4..a55636e 100644
--- a/zammad/templates/deployment-nginx.yaml
+++ b/zammad/templates/deployment-nginx.yaml
@@ -27,6 +27,18 @@ spec:
         {{- end }}
     spec:
       {{- include "zammad.podSpec.deployment" . | nindent 6 }}
+      {{- with .Values.zammadConfig.nginx.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.zammadConfig.nginx.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.zammadConfig.nginx.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       containers:
         {{- with .Values.zammadConfig.nginx.sidecars }}
         {{- toYaml . | nindent 8}}
diff --git a/zammad/templates/deployment-railsserver.yaml b/zammad/templates/deployment-railsserver.yaml
index 4676d58..a69a126 100644
--- a/zammad/templates/deployment-railsserver.yaml
+++ b/zammad/templates/deployment-railsserver.yaml
@@ -27,6 +27,18 @@ spec:
         {{- end }}
     spec:
       {{- include "zammad.podSpec.deployment" . | nindent 6 }}
+      {{- with .Values.zammadConfig.railsserver.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.zammadConfig.railsserver.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.zammadConfig.railsserver.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       containers:
         {{- with .Values.zammadConfig.railsserver.sidecars }}
         {{- toYaml . | nindent 8}}
diff --git a/zammad/templates/deployment-scheduler.yaml b/zammad/templates/deployment-scheduler.yaml
index c4b7192..b133bda 100644
--- a/zammad/templates/deployment-scheduler.yaml
+++ b/zammad/templates/deployment-scheduler.yaml
@@ -31,6 +31,18 @@ spec:
         {{- end }}
     spec:
       {{- include "zammad.podSpec.deployment" . | nindent 6 }}
+      {{- with .Values.zammadConfig.scheduler.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.zammadConfig.scheduler.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.zammadConfig.scheduler.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       containers:
         {{- with .Values.zammadConfig.scheduler.sidecars }}
         {{- toYaml . | nindent 8}}
diff --git a/zammad/templates/job-init.yaml b/zammad/templates/job-init.yaml
index b906d70..338fafa 100755
--- a/zammad/templates/job-init.yaml
+++ b/zammad/templates/job-init.yaml
@@ -38,6 +38,18 @@ spec:
       {{- with .Values.zammadConfig.initJob.podSpec }}
       {{- toYaml . | nindent 6}}
       {{- end }}
+      {{- with .Values.zammadConfig.initJob.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.zammadConfig.initJob.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.zammadConfig.initJob.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       restartPolicy: OnFailure
       initContainers:
         {{- with .Values.initContainers }}
diff --git a/zammad/values.yaml b/zammad/values.yaml
index 9299c67..e2bb08f 100755
--- a/zammad/values.yaml
+++ b/zammad/values.yaml
@@ -137,6 +137,30 @@ zammadConfig:
       # my-label: "value"
     podAnnotations: {}
       # my-annotation: "value"
+    nodeSelector: {}
+      # node-label: "value"
+    tolerations: []
+      # - key: "key"
+      #   operator: "Equal"
+      #   value: "value"
+      #   effect: "NoSchedule"
+    affinity: {}
+      # nodeAffinity:
+      #   requiredDuringSchedulingIgnoredDuringExecution:
+      #     nodeSelectorTerms:
+      #       - matchExpressions:
+      #           - key: "node-label"
+      #             operator: In
+      #             values:
+      #               - "value"
+      # podAntiAffinity:
+      #   preferredDuringSchedulingIgnoredDuringExecution:
+      #     - weight: 100
+      #       podAffinityTerm:
+      #         topologyKey: kubernetes.io/hostname # For host anti-affinity
+      #         labelSelector:
+      #           matchLabels:
+      #             app.kubernetes.io/component: zammad-nginx
 
   postgresql:
     # enable/disable postgresql chart dependency
@@ -195,6 +219,30 @@ zammadConfig:
       # my-label: "value"
     podAnnotations: {}
       # my-annotation: "value"
+    affinity: {}
+      # nodeAffinity:
+      #   requiredDuringSchedulingIgnoredDuringExecution:
+      #     nodeSelectorTerms:
+      #       - matchExpressions:
+      #           - key: "node-label"
+      #             operator: In
+      #             values:
+      #               - "value"
+      # podAntiAffinity:
+      #   preferredDuringSchedulingIgnoredDuringExecution:
+      #     - weight: 100
+      #       podAffinityTerm:
+      #         topologyKey: kubernetes.io/hostname # For host anti-affinity
+      #         labelSelector:
+      #           matchLabels:
+      #             app.kubernetes.io/component: zammad-railsserver
+    nodeSelector: {}
+      # node-label: "value"
+    tolerations: []
+      # - key: "key"
+      #   operator: "Equal"
+      #   value: "value"
+      #   effect: "NoSchedule"
 
   redis:
     # enable/disable redis chart dependency
@@ -225,6 +273,22 @@ zammadConfig:
       # my-label: "value"
     podAnnotations: {}
       # my-annotation: "value"
+    affinity: {}
+      # nodeAffinity:
+      #   requiredDuringSchedulingIgnoredDuringExecution:
+      #     nodeSelectorTerms:
+      #       - matchExpressions:
+      #           - key: "node-label"
+      #             operator: In
+      #             values:
+      #               - "value"
+    nodeSelector: {}
+      # node-label: "value"
+    tolerations: []
+      # - key: "key"
+      #   operator: "Equal"
+      #   value: "value"
+      #   effect: "NoSchedule"
 
   storageVolume:
     # Enable this for 'File' based storage in Zammad. You must provide an externally managed 'extistingClaim'
@@ -292,6 +356,22 @@ zammadConfig:
       # my-label: "value"
     podAnnotations: {}
       # my-annotation: "value"
+    affinity: {}
+      # nodeAffinity:
+      #   requiredDuringSchedulingIgnoredDuringExecution:
+      #     nodeSelectorTerms:
+      #       - matchExpressions:
+      #           - key: "node-label"
+      #             operator: In
+      #             values:
+      #               - "value"
+    nodeSelector: {}
+      # node-label: "value"
+    tolerations: []
+      # - key: "key"
+      #   operator: "Equal"
+      #   value: "value"
+      #   effect: "NoSchedule"
 
   initContainers:
     elasticsearch:
@@ -381,6 +461,23 @@ zammadConfig:
     # my-annotation: "value"
     podSpec: {}
     # my-podspec: "value"
+    affinity: {}
+      # nodeAffinity:
+      #   requiredDuringSchedulingIgnoredDuringExecution:
+      #     nodeSelectorTerms:
+      #       - matchExpressions:
+      #           - key: "node-label"
+      #             operator: In
+      #             values:
+      #               - "value"
+    nodeSelector: {}
+      # node-label: "value"
+    tolerations: []
+      # - key: "key"
+      #   operator: "Equal"
+      #   value: "value"
+      #   effect: "NoSchedule"
+
 
   cronJob:
     reindex:
@@ -441,18 +538,39 @@ autoWizard:
   #     ]
   #   }
 
-commonLabels: {}
-  # my-label: "value"
+# Common pod affinity for all Zammad components. Values in .Zammad.*.affinity will override this.
+affinity: {}
+  # nodeAffinity:
+  #   requiredDuringSchedulingIgnoredDuringExecution:
+  #     nodeSelectorTerms:
+  #       - matchExpressions:
+  #           - key: "node-label"
+  #             operator: In
+  #             values:
+  #               - "value"
+
 commonAnnotations: {}
   # my-annotation: "value"
-podLabels: {}
-    # my-label: "value"
+
+commonLabels: {}
+  # my-label: "value"
+
+# Common pod nodeSelector for all Zammad components. Values in .Zammad.*.nodeSelector will override this.
+nodeSelector: {}
+  # node-label: "value"
+
 podAnnotations: {}
   # my-annotation: "value"
 
-nodeSelector: {}
+podLabels: {}
+  # my-label: "value"
+
+# Common pod tolerations for all Zammad components. Values in .Zammad.*.tolerations will override this.
 tolerations: []
-affinity: {}
+  # - key: "key"
+  #   operator: "Equal"
+  #   value: "value"
+  #   effect: "NoSchedule"
 
 # service account configurations
 serviceAccount: