diff --git a/charts/accessnode/Chart.yaml b/charts/accessnode/Chart.yaml
index dbee218..1765055 100644
--- a/charts/accessnode/Chart.yaml
+++ b/charts/accessnode/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: accessnode
 description: A Helm chart for creating an access node
 type: application
-version: "1.0.9"
+version: "1.0.10"
 appVersion: "1"
diff --git a/charts/accessnode/templates/deploy.yaml b/charts/accessnode/templates/deploy.yaml
index e87bd02..8d675f9 100644
--- a/charts/accessnode/templates/deploy.yaml
+++ b/charts/accessnode/templates/deploy.yaml
@@ -18,9 +18,23 @@ spec:
       name: {{ $objectname }}
       labels:
         app.kubernetes.io/name: {{ $objectname }}
+        app.kubernetes.io/component: accessnode
     spec:
       {{- include "cv.imagePullSecret" . }}
       {{- include "cv.additionalPodspecs" . }}
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+            - weight: 100
+              podAffinityTerm:
+                topologyKey: kubernetes.io/hostname
+                namespaceSelector: {}
+                labelSelector:
+                  matchExpressions:
+                    - key: app.kubernetes.io/component
+                      operator: In
+                      values:
+                        - accessnode
       {{- include "cv.initContainer" . }}
       containers:
       # access node
diff --git a/charts/commandcenter/Chart.yaml b/charts/commandcenter/Chart.yaml
index 61dbffa..083d459 100644
--- a/charts/commandcenter/Chart.yaml
+++ b/charts/commandcenter/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: commandcenter
 description: A Helm chart for creating the command center
 type: application
-version: "1.0.9"
+version: "1.0.10"
 appVersion: "1"
diff --git a/charts/commandcenter/templates/deploy.yaml b/charts/commandcenter/templates/deploy.yaml
index 4673284..4cb8193 100644
--- a/charts/commandcenter/templates/deploy.yaml
+++ b/charts/commandcenter/templates/deploy.yaml
@@ -18,9 +18,23 @@ spec:
       name: {{ $objectname }}
       labels:
         app.kubernetes.io/name: {{ $objectname }}
+        app.kubernetes.io/component: commandcenter
     spec:
       {{- include "cv.imagePullSecret" . }}
       {{- include "cv.additionalPodspecs" . }}
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+            - weight: 100
+              podAffinityTerm:
+                topologyKey: kubernetes.io/hostname
+                namespaceSelector: {}
+                labelSelector:
+                  matchExpressions:
+                    - key: app.kubernetes.io/component
+                      operator: In
+                      values:
+                        - commandcenter
       {{- include "cv.initContainer" . }}
       containers:
       # Command center
diff --git a/charts/cs/Chart.yaml b/charts/cs/Chart.yaml
index 73a7b47..19e8968 100644
--- a/charts/cs/Chart.yaml
+++ b/charts/cs/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: commserve
 description: A Helm chart for creating the CS component
 type: application
-version: "1.0.11"
+version: "1.0.12"
 appVersion: "1"
diff --git a/charts/cs/templates/deploy.yaml b/charts/cs/templates/deploy.yaml
index bb42cfb..f89327c 100644
--- a/charts/cs/templates/deploy.yaml
+++ b/charts/cs/templates/deploy.yaml
@@ -18,9 +18,23 @@ spec:
       name: {{ $objectname }}
       labels:
         app.kubernetes.io/name: {{ $objectname }}
+        app.kubernetes.io/component: commserve
     spec:
       {{- include "cv.imagePullSecret" . }}
       {{- include "cv.additionalPodspecs" . }}
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+            - weight: 100
+              podAffinityTerm:
+                topologyKey: kubernetes.io/hostname
+                namespaceSelector: {}
+                labelSelector:
+                  matchExpressions:
+                    - key: app.kubernetes.io/component
+                      operator: In
+                      values:
+                        - commserve
       {{- include "cv.initContainer" . }}
       containers:
       # Commserve
diff --git a/charts/gcmserver/Chart.yaml b/charts/gcmserver/Chart.yaml
index 273c6b4..6de2008 100644
--- a/charts/gcmserver/Chart.yaml
+++ b/charts/gcmserver/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: gcmserver
 description: A Helm chart for creating the gcmserver
 type: application
-version: "1.0.11"
+version: "1.0.12"
 appVersion: "1"
diff --git a/charts/gcmserver/templates/deploy.yaml b/charts/gcmserver/templates/deploy.yaml
index 94eca2b..80f75b9 100644
--- a/charts/gcmserver/templates/deploy.yaml
+++ b/charts/gcmserver/templates/deploy.yaml
@@ -18,9 +18,23 @@ spec:
       name: {{ $objectname }}
       labels:
         app.kubernetes.io/name: {{ $objectname }}
+        app.kubernetes.io/component: gcmserver
     spec:
       {{- include "cv.imagePullSecret" . }}
       {{- include "cv.additionalPodspecs" . }}
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+            - weight: 100
+              podAffinityTerm:
+                topologyKey: kubernetes.io/hostname
+                namespaceSelector: {}
+                labelSelector:
+                  matchExpressions:
+                    - key: app.kubernetes.io/component
+                      operator: In
+                      values:
+                        - gcmserver
       {{- include "cv.initContainer" . }}
       containers:
       # Webserver
diff --git a/charts/hubserver/Chart.yaml b/charts/hubserver/Chart.yaml
index f970617..23ff4a7 100644
--- a/charts/hubserver/Chart.yaml
+++ b/charts/hubserver/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: hubserver
 description: A Helm chart for creating the hubserver
 type: application
-version: "1.0.11"
+version: "1.0.12"
 appVersion: "1"
diff --git a/charts/hubserver/templates/deploy.yaml b/charts/hubserver/templates/deploy.yaml
index ebf3660..36d8618 100644
--- a/charts/hubserver/templates/deploy.yaml
+++ b/charts/hubserver/templates/deploy.yaml
@@ -18,9 +18,23 @@ spec:
       name: {{ $objectname }}
       labels:
         app.kubernetes.io/name: {{ $objectname }}
+        app.kubernetes.io/component: hubserver
     spec:
       {{- include "cv.imagePullSecret" . }}
       {{- include "cv.additionalPodspecs" . }}
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+            - weight: 100
+              podAffinityTerm:
+                topologyKey: kubernetes.io/hostname
+                namespaceSelector: {}
+                labelSelector:
+                  matchExpressions:
+                    - key: app.kubernetes.io/component
+                      operator: In
+                      values:
+                        - hubserver
       {{- include "cv.initContainer" . }}
       containers:
       # Webserver
diff --git a/charts/mediaagent/Chart.yaml b/charts/mediaagent/Chart.yaml
index a34a2b6..c770bb0 100644
--- a/charts/mediaagent/Chart.yaml
+++ b/charts/mediaagent/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: mediaagent
 description: A Helm chart for creating a media agent
 type: application
-version: "1.0.9"
+version: "1.0.10"
 appVersion: "1"
diff --git a/charts/mediaagent/templates/deploy.yaml b/charts/mediaagent/templates/deploy.yaml
index 35560b8..c5b6cee 100644
--- a/charts/mediaagent/templates/deploy.yaml
+++ b/charts/mediaagent/templates/deploy.yaml
@@ -18,9 +18,23 @@ spec:
       name: {{ $objectname }}
       labels:
         app.kubernetes.io/name: {{ $objectname }}
+        app.kubernetes.io/component: mediaagent
     spec:
       {{- include "cv.imagePullSecret" . }}
       {{- include "cv.additionalPodspecs" . }}
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+            - weight: 100
+              podAffinityTerm:
+                topologyKey: kubernetes.io/hostname
+                namespaceSelector: {}
+                labelSelector:
+                  matchExpressions:
+                    - key: app.kubernetes.io/component
+                      operator: In
+                      values:
+                        - mediaagent
       {{- include "cv.initContainer" . }}
       containers:
       # Mediaagent
diff --git a/charts/networkgateway/Chart.yaml b/charts/networkgateway/Chart.yaml
index 3674477..14bcf0b 100644
--- a/charts/networkgateway/Chart.yaml
+++ b/charts/networkgateway/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: networkgateway
 description: A Helm chart for creating an FS agent which can serve as a network gateway
 type: application
-version: "1.0.9"
+version: "1.0.10"
 appVersion: "1"
diff --git a/charts/networkgateway/templates/deploy.yaml b/charts/networkgateway/templates/deploy.yaml
index 81c8610..da3a76a 100644
--- a/charts/networkgateway/templates/deploy.yaml
+++ b/charts/networkgateway/templates/deploy.yaml
@@ -18,9 +18,23 @@ spec:
       name: {{ $objectname }}
       labels:
         app.kubernetes.io/name: {{ $objectname }}
+        app.kubernetes.io/component: networkgateway
     spec:
       {{- include "cv.imagePullSecret" . }}
       {{- include "cv.additionalPodspecs" . }}
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+            - weight: 100
+              podAffinityTerm:
+                topologyKey: kubernetes.io/hostname
+                namespaceSelector: {}
+                labelSelector:
+                  matchExpressions:
+                    - key: app.kubernetes.io/component
+                      operator: In
+                      values:
+                        - networkgateway
       {{- include "cv.initContainer" . }}
       containers:
       # networkgateway
diff --git a/charts/webserver/Chart.yaml b/charts/webserver/Chart.yaml
index fea9f95..97afabc 100644
--- a/charts/webserver/Chart.yaml
+++ b/charts/webserver/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: webserver
 description: A Helm chart for creating the webserver
 type: application
-version: "1.0.11"
+version: "1.0.12"
 appVersion: "1"
diff --git a/charts/webserver/templates/deploy.yaml b/charts/webserver/templates/deploy.yaml
index 605dcfd..ae52622 100644
--- a/charts/webserver/templates/deploy.yaml
+++ b/charts/webserver/templates/deploy.yaml
@@ -18,9 +18,23 @@ spec:
       name: {{ $objectname }}
       labels:
         app.kubernetes.io/name: {{ $objectname }}
+        app.kubernetes.io/component: webserver
     spec:
       {{- include "cv.imagePullSecret" . }}
       {{- include "cv.additionalPodspecs" . }}
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+            - weight: 100
+              podAffinityTerm:
+                topologyKey: kubernetes.io/hostname
+                namespaceSelector: {}
+                labelSelector:
+                  matchExpressions:
+                    - key: app.kubernetes.io/component
+                      operator: In
+                      values:
+                        - webserver
       {{- include "cv.initContainer" . }}
       containers:
       # Webserver