diff --git a/helm-chart/templates/04-hub-pod.yaml b/helm-chart/templates/04-hub-pod.yaml
index f20993ded..8297067f5 100644
--- a/helm-chart/templates/04-hub-pod.yaml
+++ b/helm-chart/templates/04-hub-pod.yaml
@@ -52,11 +52,4 @@ spec:
     - effect: NoSchedule
       operator: Exists
 {{- end }}
-{{- if gt (len .Values.tap.nodeselectorterms) 0}}
-  affinity:
-    nodeAffinity:
-      requiredDuringSchedulingIgnoredDuringExecution:
-        nodeSelectorTerms:
-          {{- toYaml .Values.tap.nodeselectorterms | nindent 8 }}
-{{- end }}
 status: {}
diff --git a/helm-chart/templates/06-front-pod.yaml b/helm-chart/templates/06-front-pod.yaml
index 49abd3504..256da7a36 100644
--- a/helm-chart/templates/06-front-pod.yaml
+++ b/helm-chart/templates/06-front-pod.yaml
@@ -50,11 +50,4 @@ spec:
     - effect: NoSchedule
       operator: Exists
 {{- end }}
-{{- if gt (len .Values.tap.nodeselectorterms) 0}}
-  affinity:
-    nodeAffinity:
-      requiredDuringSchedulingIgnoredDuringExecution:
-        nodeSelectorTerms:
-          {{- toYaml .Values.tap.nodeselectorterms | nindent 8 }}
-{{- end }}
 status: {}