diff --git a/charts/aws-ebs-csi-driver/Chart.yaml b/charts/aws-ebs-csi-driver/Chart.yaml
index c308ca5586..13a922b431 100644
--- a/charts/aws-ebs-csi-driver/Chart.yaml
+++ b/charts/aws-ebs-csi-driver/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "0.9.0"
 name: aws-ebs-csi-driver
 description: A Helm chart for AWS EBS CSI Driver
-version: 0.9.3
+version: 0.9.4
 kubeVersion: ">=1.17.0-0"
 home: https://github.com/kubernetes-sigs/aws-ebs-csi-driver
 sources:
diff --git a/charts/aws-ebs-csi-driver/templates/storageclass.yaml b/charts/aws-ebs-csi-driver/templates/storageclass.yaml
index 759ff1e0a2..c69af7dc63 100644
--- a/charts/aws-ebs-csi-driver/templates/storageclass.yaml
+++ b/charts/aws-ebs-csi-driver/templates/storageclass.yaml
@@ -4,12 +4,5 @@ apiVersion: storage.k8s.io/v1
 metadata:
   name: {{ .name }}
 provisioner: ebs.csi.aws.com
-volumeBindingMode: {{ default "WaitForFirstConsumer" .volumeBindingMode }}
-{{- if hasKey . "reclaimPolicy" }}
-reclaimPolicy: {{ .reclaimPolicy }}
-{{- end }}
-{{- with .parameters }}
-parameters:
-{{ toYaml . | indent 2 }}
-{{- end }}
+{{ omit (dict "volumeBindingMode" "WaitForFirstConsumer" | merge .) "name" | toYaml }}
 {{- end }}