--- charts-original/templates/deployment.yaml
+++ charts/templates/deployment.yaml
@@ -243,12 +243,12 @@
       affinity:
 {{ toYaml .Values.affinity | indent 8 }}
       {{- end }}
+      nodeSelector: {{ include "linux-node-selector" . | nindent 8 }}
       {{- if .Values.nodeSelector }}
-      nodeSelector:
 {{ toYaml .Values.nodeSelector | indent 8 }}
       {{- end }}
+      tolerations: {{ include "linux-node-tolerations" . | nindent 8 }}
       {{- if .Values.tolerations }}
-      tolerations:
 {{ toYaml .Values.tolerations | indent 8 }}
       {{- end }}
       {{- if .Values.topologySpreadConstraints }}