diff --git a/charts/kubezero-storage/Chart.yaml b/charts/kubezero-storage/Chart.yaml
index 3a7a6b39..c29a11e0 100644
--- a/charts/kubezero-storage/Chart.yaml
+++ b/charts/kubezero-storage/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: kubezero-storage
 description: KubeZero umbrella chart for all things storage incl. AWS EBS/EFS, openEBS-lvm, gemini
 type: application
-version: 0.5.2
+version: 0.5.3
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
 keywords:
@@ -32,7 +32,7 @@ dependencies:
     condition: aws-ebs-csi-driver.enabled
     # repository: https://kubernetes-sigs.github.io/aws-ebs-csi-driver
   - name: aws-efs-csi-driver
-    version: 2.2.0
+    version: 2.2.1
     condition: aws-efs-csi-driver.enabled
     # repository: https://kubernetes-sigs.github.io/aws-ebs-csi-driver
 kubeVersion: ">= 1.20.0"
diff --git a/charts/kubezero-storage/README.md b/charts/kubezero-storage/README.md
index f79ece7d..8f8135b4 100644
--- a/charts/kubezero-storage/README.md
+++ b/charts/kubezero-storage/README.md
@@ -1,6 +1,6 @@
 # kubezero-storage
 
-![Version: 0.5.2](https://img.shields.io/badge/Version-0.5.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 0.5.3](https://img.shields.io/badge/Version-0.5.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 KubeZero umbrella chart for all things storage incl. AWS EBS/EFS, openEBS-lvm, gemini
 
@@ -19,7 +19,7 @@ Kubernetes: `>= 1.20.0`
 | Repository | Name | Version |
 |------------|------|---------|
 |  | aws-ebs-csi-driver | 2.6.2 |
-|  | aws-efs-csi-driver | 2.2.0 |
+|  | aws-efs-csi-driver | 2.2.1 |
 |  | gemini | 0.0.8 |
 |  | lvm-localpv | 0.8.6 |
 | https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.4 |
@@ -94,11 +94,14 @@ Kubernetes: `>= 1.20.0`
 | lvm-localpv.storageClass.vgpattern | string | `""` |  |
 | snapshotController.enabled | bool | `true` |  |
 | snapshotController.logLevel | int | `2` |  |
+| snapshotController.nodeSelector."node-role.kubernetes.io/control-plane" | string | `""` |  |
 | snapshotController.replicas | int | `1` |  |
 | snapshotController.resources.limits.cpu | string | `"100m"` |  |
 | snapshotController.resources.limits.memory | string | `"64Mi"` |  |
 | snapshotController.resources.requests.cpu | string | `"20m"` |  |
 | snapshotController.resources.requests.memory | string | `"16Mi"` |  |
+| snapshotController.tolerations[0].effect | string | `"NoSchedule"` |  |
+| snapshotController.tolerations[0].key | string | `"node-role.kubernetes.io/master"` |  |
 
 # Snapshotter
 - https://kubernetes-csi.github.io/docs/snapshot-controller.html#deployment
diff --git a/charts/kubezero-storage/charts/aws-efs-csi-driver/CHANGELOG.md b/charts/kubezero-storage/charts/aws-efs-csi-driver/CHANGELOG.md
index 729a5bc1..5ca8fdca 100644
--- a/charts/kubezero-storage/charts/aws-efs-csi-driver/CHANGELOG.md
+++ b/charts/kubezero-storage/charts/aws-efs-csi-driver/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Helm chart
 
+# v2.2.1
+* Bump app/driver version to `v1.3.5`
+
 # v2.2.0
 * Allow health ports to be configured
 * Add Missing "patch" permission for "events"
diff --git a/charts/kubezero-storage/charts/aws-efs-csi-driver/Chart.yaml b/charts/kubezero-storage/charts/aws-efs-csi-driver/Chart.yaml
index cbecb953..69918570 100644
--- a/charts/kubezero-storage/charts/aws-efs-csi-driver/Chart.yaml
+++ b/charts/kubezero-storage/charts/aws-efs-csi-driver/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 1.3.4
+appVersion: 1.3.5
 description: A Helm chart for AWS EFS CSI Driver
 home: https://github.com/kubernetes-sigs/aws-efs-csi-driver
 keywords:
@@ -15,4 +15,4 @@ maintainers:
 name: aws-efs-csi-driver
 sources:
 - https://github.com/kubernetes-sigs/aws-efs-csi-driver
-version: 2.2.0
+version: 2.2.1
diff --git a/charts/kubezero-storage/charts/aws-efs-csi-driver/values.yaml b/charts/kubezero-storage/charts/aws-efs-csi-driver/values.yaml
index e315eff3..b923b600 100644
--- a/charts/kubezero-storage/charts/aws-efs-csi-driver/values.yaml
+++ b/charts/kubezero-storage/charts/aws-efs-csi-driver/values.yaml
@@ -9,7 +9,7 @@ replicaCount: 2
 
 image:
   repository: amazon/aws-efs-csi-driver
-  tag: "v1.3.4"
+  tag: "v1.3.5"
   pullPolicy: IfNotPresent
 
 sidecars:
diff --git a/charts/kubezero-storage/templates/snapshot-controller/controller.yaml b/charts/kubezero-storage/templates/snapshot-controller/controller.yaml
index 456b3105..2d6357e0 100644
--- a/charts/kubezero-storage/templates/snapshot-controller/controller.yaml
+++ b/charts/kubezero-storage/templates/snapshot-controller/controller.yaml
@@ -38,3 +38,11 @@ spec:
           imagePullPolicy: IfNotPresent
           resources:
             {{- toYaml .Values.snapshotController.resources | nindent 12 }}
+      {{- with .Values.snapshotController.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.snapshotController.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
diff --git a/charts/kubezero-storage/values.yaml b/charts/kubezero-storage/values.yaml
index a696994f..24a951e7 100644
--- a/charts/kubezero-storage/values.yaml
+++ b/charts/kubezero-storage/values.yaml
@@ -3,6 +3,12 @@ snapshotController:
   replicas: 1
   logLevel: 2
 
+  tolerations:
+  - key: node-role.kubernetes.io/master
+    effect: NoSchedule
+  nodeSelector:
+    node-role.kubernetes.io/control-plane: ""
+
   resources:
     requests:
       memory: 16Mi