diff --git a/cli/internal/helm/charts/edgeless/constellation-services/charts/aws-csi-driver/values.yaml b/cli/internal/helm/charts/edgeless/constellation-services/charts/aws-csi-driver/values.yaml
index 4ff8a2d72..defdd4d83 100644
--- a/cli/internal/helm/charts/edgeless/constellation-services/charts/aws-csi-driver/values.yaml
+++ b/cli/internal/helm/charts/edgeless/constellation-services/charts/aws-csi-driver/values.yaml
@@ -171,7 +171,8 @@ controller:
   # ID of the Kubernetes cluster used for tagging provisioned EBS volumes (optional).
   k8sTagClusterId:
   logLevel: 2
-  nodeSelector: {}
+  nodeSelector:
+    node-role.kubernetes.io/control-plane: ""
   podAnnotations: {}
   podLabels: {}
   priorityClassName: system-cluster-critical
@@ -204,9 +205,18 @@ controller:
   tolerations:
     - key: CriticalAddonsOnly
       operator: Exists
-    - effect: NoExecute
+    - effect: NoSchedule
+      key: node-role.kubernetes.io/control-plane
+      operator: Exists
+    - effect: NoSchedule
+      key: node-role.kubernetes.io/master
+      operator: Exists
+    - effect: NoSchedule
+      key: node.cloudprovider.kubernetes.io/uninitialized
+      operator: Exists
+    - effect: NoSchedule
+      key: node.kubernetes.io/not-ready
       operator: Exists
-      tolerationSeconds: 300
   # TSCs without the label selector stanza
   #
   # Example:
diff --git a/cli/internal/helm/update-csi-charts.sh b/cli/internal/helm/update-csi-charts.sh
index db55a34c3..a6cc7f8a1 100755
--- a/cli/internal/helm/update-csi-charts.sh
+++ b/cli/internal/helm/update-csi-charts.sh
@@ -59,7 +59,7 @@ download_chart() {
 }
 
 ## AWS CSI Driver
-download_chart "https://github.com/edgelesssys/constellation-aws-ebs-csi-driver" "v1.1.0" "charts/aws-ebs-csi-driver" "aws-csi-driver"
+download_chart "https://github.com/edgelesssys/constellation-aws-ebs-csi-driver" "v1.1.1" "charts/aws-ebs-csi-driver" "aws-csi-driver"
 
 ## Azure CSI Driver
 download_chart "https://github.com/edgelesssys/constellation-azuredisk-csi-driver" "v1.2.0" "charts/edgeless" "azuredisk-csi-driver"