diff --git a/charts/accessnode/Chart.yaml b/charts/accessnode/Chart.yaml
index bf091ff..5ed135e 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.11"
+version: "1.0.12"
 appVersion: "1"
diff --git a/charts/accessnode/templates/deploy.yaml b/charts/accessnode/templates/deploy.yaml
index 1ecab5e..913bf07 100644
--- a/charts/accessnode/templates/deploy.yaml
+++ b/charts/accessnode/templates/deploy.yaml
@@ -24,9 +24,25 @@ spec:
         commvault.com/install-layout: {{ include "cv.installLayoutVersion" . | trim | quote }}
       labels:
         app.kubernetes.io/name: {{ $objectname }}
+        app.kubernetes.io/component: accessnode
     spec:
       {{- include "cv.imagePullSecret" . }}
       {{- include "cv.additionalPodspecs" . }}
+      {{- if eq (or .Values.nodeAffinityMode ((.Values).global).nodeAffinityMode) 1 }}
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+            - weight: 100
+              podAffinityTerm:
+                topologyKey: kubernetes.io/hostname
+                namespaceSelector: {}
+                labelSelector:
+                  matchExpressions:
+                    - key: app.kubernetes.io/component
+                      operator: In
+                      values:
+                        - accessnode
+      {{- end }}
       {{- include "cv.initContainer" . }}
       containers:
       # access node
diff --git a/charts/accessnode/values.yaml b/charts/accessnode/values.yaml
index fca7144..b9c478c 100644
--- a/charts/accessnode/values.yaml
+++ b/charts/accessnode/values.yaml
@@ -1,3 +1,6 @@
+# nodeAffinityMode:  # Optional. Node affinity rules mode. Values: 0 (disabled), 1 (enabled). Default is 0
+nodeAffinityMode: 0
+
 # clientName:       # Optional. Client Name. Helm Release name will be used by default
 
 # displayname:       # Optional. Client Display Name. Defaults to same value as clientName
diff --git a/charts/commandcenter/Chart.yaml b/charts/commandcenter/Chart.yaml
index 37abdee..2566316 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.11"
+version: "1.0.12"
 appVersion: "1"
diff --git a/charts/commandcenter/templates/deploy.yaml b/charts/commandcenter/templates/deploy.yaml
index 9a90138..b93d366 100644
--- a/charts/commandcenter/templates/deploy.yaml
+++ b/charts/commandcenter/templates/deploy.yaml
@@ -24,9 +24,25 @@ spec:
         commvault.com/install-layout: {{ include "cv.installLayoutVersion" . | trim | quote }}
       labels:
         app.kubernetes.io/name: {{ $objectname }}
+        app.kubernetes.io/component: commandcenter
     spec:
       {{- include "cv.imagePullSecret" . }}
       {{- include "cv.additionalPodspecs" . }}
+      {{- if eq (or .Values.nodeAffinityMode ((.Values).global).nodeAffinityMode) 1 }}
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+            - weight: 100
+              podAffinityTerm:
+                topologyKey: kubernetes.io/hostname
+                namespaceSelector: {}
+                labelSelector:
+                  matchExpressions:
+                    - key: app.kubernetes.io/component
+                      operator: In
+                      values:
+                        - commandcenter
+      {{- end }}
       {{- include "cv.initContainer" . }}
       containers:
       # Command center
diff --git a/charts/commandcenter/values.yaml b/charts/commandcenter/values.yaml
index 871a280..7d833da 100644
--- a/charts/commandcenter/values.yaml
+++ b/charts/commandcenter/values.yaml
@@ -1,3 +1,6 @@
+# nodeAffinityMode:  # Optional. Node affinity rules mode. Values: 0 (disabled), 1 (enabled). Default is 0
+nodeAffinityMode: 0
+
 # clientName:       # Optional. Client Name. Helm Release name will be used by default
 
 # displayname:       # Optional. Client Display Name. Defaults to same value as clientName
diff --git a/charts/cs/Chart.yaml b/charts/cs/Chart.yaml
index d8a3430..192e738 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.13"
+version: "1.0.14"
 appVersion: "1"
diff --git a/charts/cs/templates/deploy.yaml b/charts/cs/templates/deploy.yaml
index 546876f..58667d9 100644
--- a/charts/cs/templates/deploy.yaml
+++ b/charts/cs/templates/deploy.yaml
@@ -24,9 +24,25 @@ spec:
         commvault.com/install-layout: {{ include "cv.installLayoutVersion" . | trim | quote }}
       labels:
         app.kubernetes.io/name: {{ $objectname }}
+        app.kubernetes.io/component: commserve
     spec:
       {{- include "cv.imagePullSecret" . }}
       {{- include "cv.additionalPodspecs" . }}
+      {{- if eq (or .Values.nodeAffinityMode ((.Values).global).nodeAffinityMode) 1 }}
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+            - weight: 100
+              podAffinityTerm:
+                topologyKey: kubernetes.io/hostname
+                namespaceSelector: {}
+                labelSelector:
+                  matchExpressions:
+                    - key: app.kubernetes.io/component
+                      operator: In
+                      values:
+                        - commserve
+      {{- end }}
       {{- include "cv.initContainer" . }}
       containers:
       # Commserve
diff --git a/charts/cs/values.yaml b/charts/cs/values.yaml
index f1f3259..d9bba12 100644
--- a/charts/cs/values.yaml
+++ b/charts/cs/values.yaml
@@ -1,3 +1,6 @@
+# nodeAffinityMode:  # Optional. Node affinity rules mode. Values: 0 (disabled), 1 (enabled). Default is 0
+nodeAffinityMode: 0
+
 # clientName:       # Optional. Client Name. Helm Release name will be used by default
 
 # displayname:       # Optional. Client Display Name. Defaults to same value as clientName
diff --git a/charts/gcmserver/Chart.yaml b/charts/gcmserver/Chart.yaml
index 0f2c6c6..4aa9fe3 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.13"
+version: "1.0.14"
 appVersion: "1"
diff --git a/charts/gcmserver/templates/deploy.yaml b/charts/gcmserver/templates/deploy.yaml
index 7550890..9441c89 100644
--- a/charts/gcmserver/templates/deploy.yaml
+++ b/charts/gcmserver/templates/deploy.yaml
@@ -24,9 +24,25 @@ spec:
         commvault.com/install-layout: {{ include "cv.installLayoutVersion" . | trim | quote }}
       labels:
         app.kubernetes.io/name: {{ $objectname }}
+        app.kubernetes.io/component: gcmserver
     spec:
       {{- include "cv.imagePullSecret" . }}
       {{- include "cv.additionalPodspecs" . }}
+      {{- if eq (or .Values.nodeAffinityMode ((.Values).global).nodeAffinityMode) 1 }}
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+            - weight: 100
+              podAffinityTerm:
+                topologyKey: kubernetes.io/hostname
+                namespaceSelector: {}
+                labelSelector:
+                  matchExpressions:
+                    - key: app.kubernetes.io/component
+                      operator: In
+                      values:
+                        - gcmserver
+      {{- end }}
       {{- include "cv.initContainer" . }}
       containers:
       # Webserver
diff --git a/charts/gcmserver/values.yaml b/charts/gcmserver/values.yaml
index 5af03c1..0c2dc90 100644
--- a/charts/gcmserver/values.yaml
+++ b/charts/gcmserver/values.yaml
@@ -1,3 +1,6 @@
+# nodeAffinityMode:  # Optional. Node affinity rules mode. Values: 0 (disabled), 1 (enabled). Default is 0
+nodeAffinityMode: 0
+
 # clientName:       # Optional. Client Name. Helm Release name will be used by default
 
 # displayname:       # Optional. Client Display Name. Defaults to same value as clientName
diff --git a/charts/hubserver/Chart.yaml b/charts/hubserver/Chart.yaml
index 9b2f152..59cb945 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.13"
+version: "1.0.14"
 appVersion: "1"
diff --git a/charts/hubserver/templates/deploy.yaml b/charts/hubserver/templates/deploy.yaml
index 761d6a1..e59f656 100644
--- a/charts/hubserver/templates/deploy.yaml
+++ b/charts/hubserver/templates/deploy.yaml
@@ -24,9 +24,25 @@ spec:
         commvault.com/install-layout: {{ include "cv.installLayoutVersion" . | trim | quote }}
       labels:
         app.kubernetes.io/name: {{ $objectname }}
+        app.kubernetes.io/component: hubserver
     spec:
       {{- include "cv.imagePullSecret" . }}
       {{- include "cv.additionalPodspecs" . }}
+      {{- if eq (or .Values.nodeAffinityMode ((.Values).global).nodeAffinityMode) 1 }}
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+            - weight: 100
+              podAffinityTerm:
+                topologyKey: kubernetes.io/hostname
+                namespaceSelector: {}
+                labelSelector:
+                  matchExpressions:
+                    - key: app.kubernetes.io/component
+                      operator: In
+                      values:
+                        - hubserver
+      {{- end }}
       {{- include "cv.initContainer" . }}
       containers:
       # Webserver
diff --git a/charts/hubserver/values.yaml b/charts/hubserver/values.yaml
index 161945d..744ca49 100644
--- a/charts/hubserver/values.yaml
+++ b/charts/hubserver/values.yaml
@@ -1,3 +1,6 @@
+# nodeAffinityMode:  # Optional. Node affinity rules mode. Values: 0 (disabled), 1 (enabled). Default is 0
+nodeAffinityMode: 0
+
 # clientName:       # Optional. Client Name. Helm Release name will be used by default
 
 # displayname:       # Optional. Client Display Name. Defaults to same value as clientName
diff --git a/charts/mediaagent/Chart.yaml b/charts/mediaagent/Chart.yaml
index dd86def..78c2f02 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.11"
+version: "1.0.12"
 appVersion: "1"
diff --git a/charts/mediaagent/templates/deploy.yaml b/charts/mediaagent/templates/deploy.yaml
index 021e761..7957baf 100644
--- a/charts/mediaagent/templates/deploy.yaml
+++ b/charts/mediaagent/templates/deploy.yaml
@@ -24,9 +24,25 @@ spec:
         commvault.com/install-layout: {{ include "cv.installLayoutVersion" . | trim | quote }}
       labels:
         app.kubernetes.io/name: {{ $objectname }}
+        app.kubernetes.io/component: mediaagent
     spec:
       {{- include "cv.imagePullSecret" . }}
       {{- include "cv.additionalPodspecs" . }}
+      {{- if eq (or .Values.nodeAffinityMode ((.Values).global).nodeAffinityMode) 1 }}
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+            - weight: 100
+              podAffinityTerm:
+                topologyKey: kubernetes.io/hostname
+                namespaceSelector: {}
+                labelSelector:
+                  matchExpressions:
+                    - key: app.kubernetes.io/component
+                      operator: In
+                      values:
+                        - mediaagent
+      {{- end }}
       {{- include "cv.initContainer" . }}
       containers:
       # Mediaagent
diff --git a/charts/mediaagent/values.yaml b/charts/mediaagent/values.yaml
index b4b2b3d..94a0559 100644
--- a/charts/mediaagent/values.yaml
+++ b/charts/mediaagent/values.yaml
@@ -1,3 +1,6 @@
+# nodeAffinityMode:  # Optional. Node affinity rules mode. Values: 0 (disabled), 1 (enabled). Default is 0
+nodeAffinityMode: 0
+
 # clientName:       # Optional. Client Name. Helm Release name will be used by default
 
 # displayname:       # Optional. Client Display Name. Defaults to same value as clientName
diff --git a/charts/networkgateway/Chart.yaml b/charts/networkgateway/Chart.yaml
index e4c39c5..9cdcb4a 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.11"
+version: "1.0.12"
 appVersion: "1"
diff --git a/charts/networkgateway/templates/deploy.yaml b/charts/networkgateway/templates/deploy.yaml
index 5b1baef..2fd3c11 100644
--- a/charts/networkgateway/templates/deploy.yaml
+++ b/charts/networkgateway/templates/deploy.yaml
@@ -24,9 +24,25 @@ spec:
         commvault.com/install-layout: {{ include "cv.installLayoutVersion" . | trim | quote }}
       labels:
         app.kubernetes.io/name: {{ $objectname }}
+        app.kubernetes.io/component: networkgateway
     spec:
       {{- include "cv.imagePullSecret" . }}
       {{- include "cv.additionalPodspecs" . }}
+      {{- if eq (or .Values.nodeAffinityMode ((.Values).global).nodeAffinityMode) 1 }}
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+            - weight: 100
+              podAffinityTerm:
+                topologyKey: kubernetes.io/hostname
+                namespaceSelector: {}
+                labelSelector:
+                  matchExpressions:
+                    - key: app.kubernetes.io/component
+                      operator: In
+                      values:
+                        - networkgateway
+      {{- end }}
       {{- include "cv.initContainer" . }}
       containers:
       # networkgateway
diff --git a/charts/networkgateway/values.yaml b/charts/networkgateway/values.yaml
index 28cb777..e91d505 100644
--- a/charts/networkgateway/values.yaml
+++ b/charts/networkgateway/values.yaml
@@ -1,3 +1,6 @@
+# nodeAffinityMode:  # Optional. Node affinity rules mode. Values: 0 (disabled), 1 (enabled). Default is 0
+nodeAffinityMode: 0
+
 # clientName:       # Optional. Client Name. Helm Release name will be used by default
 
 # displayname:       # Optional. Client Display Name. Defaults to same value as clientName
diff --git a/charts/webserver/Chart.yaml b/charts/webserver/Chart.yaml
index bfbe19b..195f8df 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.13"
+version: "1.0.14"
 appVersion: "1"
diff --git a/charts/webserver/templates/deploy.yaml b/charts/webserver/templates/deploy.yaml
index 3f40f8b..51d733b 100644
--- a/charts/webserver/templates/deploy.yaml
+++ b/charts/webserver/templates/deploy.yaml
@@ -24,9 +24,25 @@ spec:
         commvault.com/install-layout: {{ include "cv.installLayoutVersion" . | trim | quote }}
       labels:
         app.kubernetes.io/name: {{ $objectname }}
+        app.kubernetes.io/component: webserver
     spec:
       {{- include "cv.imagePullSecret" . }}
       {{- include "cv.additionalPodspecs" . }}
+      {{- if eq (or .Values.nodeAffinityMode ((.Values).global).nodeAffinityMode) 1 }}
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+            - weight: 100
+              podAffinityTerm:
+                topologyKey: kubernetes.io/hostname
+                namespaceSelector: {}
+                labelSelector:
+                  matchExpressions:
+                    - key: app.kubernetes.io/component
+                      operator: In
+                      values:
+                        - webserver
+      {{- end }}
       {{- include "cv.initContainer" . }}
       containers:
       # Webserver
diff --git a/charts/webserver/values.yaml b/charts/webserver/values.yaml
index 2bd5ff7..5bcddff 100644
--- a/charts/webserver/values.yaml
+++ b/charts/webserver/values.yaml
@@ -1,3 +1,6 @@
+# nodeAffinityMode:  # Optional. Node affinity rules mode. Values: 0 (disabled), 1 (enabled). Default is 0
+nodeAffinityMode: 0
+
 # clientName:       # Optional. Client Name. Helm Release name will be used by default
 
 # displayname:       # Optional. Client Display Name. Defaults to same value as clientName