diff --git a/charts/v1.7.0/csi-driver-smb-v1.7.0.tgz b/charts/v1.7.0/csi-driver-smb-v1.7.0.tgz
index f21b6aa3f23..c4cae6018f5 100644
Binary files a/charts/v1.7.0/csi-driver-smb-v1.7.0.tgz and b/charts/v1.7.0/csi-driver-smb-v1.7.0.tgz differ
diff --git a/charts/v1.7.0/csi-driver-smb/templates/csi-smb-node-windows.yaml b/charts/v1.7.0/csi-driver-smb/templates/csi-smb-node-windows.yaml
index 6327907b15c..3aa6aeac029 100644
--- a/charts/v1.7.0/csi-driver-smb/templates/csi-smb-node-windows.yaml
+++ b/charts/v1.7.0/csi-driver-smb/templates/csi-smb-node-windows.yaml
@@ -24,6 +24,13 @@ spec:
 {{- end }}
       nodeSelector:
         kubernetes.io/os: windows
+{{- with .Values.node.nodeSelector }}
+{{ toYaml . | indent 8 }}
+{{- end }}
+{{- with .Values.node.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+{{- end }}
       priorityClassName: system-node-critical
       serviceAccountName: {{ .Values.serviceAccount.node }}
       {{- include "smb.pullSecrets" . | indent 6 }}
diff --git a/charts/v1.7.0/csi-driver-smb/templates/csi-smb-node.yaml b/charts/v1.7.0/csi-driver-smb/templates/csi-smb-node.yaml
index d2ad310aab0..9fe963b5cc2 100644
--- a/charts/v1.7.0/csi-driver-smb/templates/csi-smb-node.yaml
+++ b/charts/v1.7.0/csi-driver-smb/templates/csi-smb-node.yaml
@@ -33,9 +33,10 @@ spec:
 {{- with .Values.node.nodeSelector }}
 {{ toYaml . | indent 8 }}
 {{- end }}
-        {{- if .Values.node.affinity }}
-{{- toYaml .Values.node.affinity | nindent 8 }}
-        {{- end }}
+{{- with .Values.node.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+{{- end }}
       priorityClassName: {{ .Values.priorityClassName | quote }}
 {{- with .Values.linux.tolerations }}
       tolerations: