diff --git a/charts/latest/csi-driver-smb-v0.0.0.tgz b/charts/latest/csi-driver-smb-v0.0.0.tgz
index 0756927921c..93374b055f8 100644
Binary files a/charts/latest/csi-driver-smb-v0.0.0.tgz and b/charts/latest/csi-driver-smb-v0.0.0.tgz differ
diff --git a/charts/latest/csi-driver-smb/templates/csi-smb-controller.yaml b/charts/latest/csi-driver-smb/templates/csi-smb-controller.yaml
index 1b11596a1e3..86d8d08eb5c 100755
--- a/charts/latest/csi-driver-smb/templates/csi-smb-controller.yaml
+++ b/charts/latest/csi-driver-smb/templates/csi-smb-controller.yaml
@@ -25,10 +25,10 @@ spec:
 {{- end }}
     spec:
     # runOnControlPlane=true or runOnMaster=true only takes effect if affinity is not set
-    {{- if contains (tpl "{{ .Values.controller.affinity }}" .) "nodeSelectorTerms" }}
+    {{- if tpl "{{ .Values.controller.affinity }}" . | contains "nodeSelectorTerms" }}
       {{- with .Values.controller.affinity }}
       affinity:
-      {{ toYaml . | indent 8 }}
+{{ toYaml . | indent 8 }}
       {{- end }}
     {{- else if or .Values.controller.runOnControlPlane .Values.controller.runOnMaster}}
       affinity:
diff --git a/charts/v1.17.0/csi-driver-smb-v1.17.0.tgz b/charts/v1.17.0/csi-driver-smb-v1.17.0.tgz
index a55f80c06f0..f9b879c3d0e 100644
Binary files a/charts/v1.17.0/csi-driver-smb-v1.17.0.tgz and b/charts/v1.17.0/csi-driver-smb-v1.17.0.tgz differ
diff --git a/charts/v1.17.0/csi-driver-smb/templates/csi-smb-controller.yaml b/charts/v1.17.0/csi-driver-smb/templates/csi-smb-controller.yaml
index 1b11596a1e3..86d8d08eb5c 100644
--- a/charts/v1.17.0/csi-driver-smb/templates/csi-smb-controller.yaml
+++ b/charts/v1.17.0/csi-driver-smb/templates/csi-smb-controller.yaml
@@ -25,10 +25,10 @@ spec:
 {{- end }}
     spec:
     # runOnControlPlane=true or runOnMaster=true only takes effect if affinity is not set
-    {{- if contains (tpl "{{ .Values.controller.affinity }}" .) "nodeSelectorTerms" }}
+    {{- if tpl "{{ .Values.controller.affinity }}" . | contains "nodeSelectorTerms" }}
       {{- with .Values.controller.affinity }}
       affinity:
-      {{ toYaml . | indent 8 }}
+{{ toYaml . | indent 8 }}
       {{- end }}
     {{- else if or .Values.controller.runOnControlPlane .Values.controller.runOnMaster}}
       affinity: