diff --git a/charts/latest/blob-csi-driver-v0.0.0.tgz b/charts/latest/blob-csi-driver-v0.0.0.tgz
index 5370ea807..44dfd85d5 100644
Binary files a/charts/latest/blob-csi-driver-v0.0.0.tgz and b/charts/latest/blob-csi-driver-v0.0.0.tgz differ
diff --git a/charts/latest/blob-csi-driver/values.yaml b/charts/latest/blob-csi-driver/values.yaml
index bb7b574f3..8a280a342 100644
--- a/charts/latest/blob-csi-driver/values.yaml
+++ b/charts/latest/blob-csi-driver/values.yaml
@@ -103,6 +103,9 @@ controller:
     - key: "node-role.kubernetes.io/control-plane"
       operator: "Exists"
       effect: "NoSchedule"
+    - key: "CriticalAddonsOnly"
+      operator: "Exists"
+      effect: "NoSchedule"
 
 node:
   name: csi-blob-node
diff --git a/charts/v1.23.9/blob-csi-driver-v1.23.9.tgz b/charts/v1.23.9/blob-csi-driver-v1.23.9.tgz
index f5147a37f..0b6d14de3 100644
Binary files a/charts/v1.23.9/blob-csi-driver-v1.23.9.tgz and b/charts/v1.23.9/blob-csi-driver-v1.23.9.tgz differ
diff --git a/charts/v1.23.9/blob-csi-driver/values.yaml b/charts/v1.23.9/blob-csi-driver/values.yaml
index 0c3182d69..669823f65 100644
--- a/charts/v1.23.9/blob-csi-driver/values.yaml
+++ b/charts/v1.23.9/blob-csi-driver/values.yaml
@@ -103,6 +103,9 @@ controller:
     - key: "node-role.kubernetes.io/control-plane"
       operator: "Exists"
       effect: "NoSchedule"
+    - key: "CriticalAddonsOnly"
+      operator: "Exists"
+      effect: "NoSchedule"
 
 node:
   name: csi-blob-node
diff --git a/charts/v1.24.5/blob-csi-driver-v1.24.5.tgz b/charts/v1.24.5/blob-csi-driver-v1.24.5.tgz
index 66ecc5010..b6c8c3619 100644
Binary files a/charts/v1.24.5/blob-csi-driver-v1.24.5.tgz and b/charts/v1.24.5/blob-csi-driver-v1.24.5.tgz differ
diff --git a/charts/v1.24.5/blob-csi-driver/values.yaml b/charts/v1.24.5/blob-csi-driver/values.yaml
index 59e1bb82c..b58e0261e 100644
--- a/charts/v1.24.5/blob-csi-driver/values.yaml
+++ b/charts/v1.24.5/blob-csi-driver/values.yaml
@@ -103,6 +103,9 @@ controller:
     - key: "node-role.kubernetes.io/control-plane"
       operator: "Exists"
       effect: "NoSchedule"
+    - key: "CriticalAddonsOnly"
+      operator: "Exists"
+      effect: "NoSchedule"
 
 node:
   name: csi-blob-node
diff --git a/charts/v1.25.0/blob-csi-driver-1.25.0.tgz b/charts/v1.25.0/blob-csi-driver-1.25.0.tgz
index 18a93cab4..125d3c6c2 100644
Binary files a/charts/v1.25.0/blob-csi-driver-1.25.0.tgz and b/charts/v1.25.0/blob-csi-driver-1.25.0.tgz differ
diff --git a/charts/v1.25.0/blob-csi-driver/values.yaml b/charts/v1.25.0/blob-csi-driver/values.yaml
index b18e7b72e..de0326459 100644
--- a/charts/v1.25.0/blob-csi-driver/values.yaml
+++ b/charts/v1.25.0/blob-csi-driver/values.yaml
@@ -103,6 +103,9 @@ controller:
     - key: "node-role.kubernetes.io/control-plane"
       operator: "Exists"
       effect: "NoSchedule"
+    - key: "CriticalAddonsOnly"
+      operator: "Exists"
+      effect: "NoSchedule"
 
 node:
   name: csi-blob-node
diff --git a/deploy/csi-blob-controller.yaml b/deploy/csi-blob-controller.yaml
index aca4a48a9..e5cbcbbb0 100644
--- a/deploy/csi-blob-controller.yaml
+++ b/deploy/csi-blob-controller.yaml
@@ -32,6 +32,9 @@ spec:
         - key: "node-role.kubernetes.io/control-plane"
           operator: "Exists"
           effect: "NoSchedule"
+        - key: "CriticalAddonsOnly"
+          operator: "Exists"
+          effect: "NoSchedule"
       containers:
         - name: csi-provisioner
           image: mcr.microsoft.com/oss/kubernetes-csi/csi-provisioner:v5.1.0
diff --git a/deploy/v1.23.9/csi-blob-controller.yaml b/deploy/v1.23.9/csi-blob-controller.yaml
index 3563c8a68..cbbf89631 100644
--- a/deploy/v1.23.9/csi-blob-controller.yaml
+++ b/deploy/v1.23.9/csi-blob-controller.yaml
@@ -32,6 +32,9 @@ spec:
         - key: "node-role.kubernetes.io/control-plane"
           operator: "Exists"
           effect: "NoSchedule"
+        - key: "CriticalAddonsOnly"
+          operator: "Exists"
+          effect: "NoSchedule"
       containers:
         - name: csi-provisioner
           image: mcr.microsoft.com/oss/kubernetes-csi/csi-provisioner:v5.1.0
diff --git a/deploy/v1.23.9/csi-blob-node.yaml b/deploy/v1.23.9/csi-blob-node.yaml
index 0419a6b93..35955b0bb 100644
--- a/deploy/v1.23.9/csi-blob-node.yaml
+++ b/deploy/v1.23.9/csi-blob-node.yaml
@@ -136,7 +136,7 @@ spec:
           args:
             - "--v=5"
             - "--endpoint=$(CSI_ENDPOINT)"
-            - "--enable-blobfuse-proxy=false"
+            - "--enable-blobfuse-proxy=true"
             - "--blobfuse-proxy-endpoint=$(BLOBFUSE_PROXY_ENDPOINT)"
             - "--nodeid=$(KUBE_NODE_NAME)"
             - "--user-agent-suffix=OSS-kubectl"
diff --git a/deploy/v1.24.5/csi-blob-controller.yaml b/deploy/v1.24.5/csi-blob-controller.yaml
index cdafe002a..0899529d4 100644
--- a/deploy/v1.24.5/csi-blob-controller.yaml
+++ b/deploy/v1.24.5/csi-blob-controller.yaml
@@ -32,6 +32,9 @@ spec:
         - key: "node-role.kubernetes.io/control-plane"
           operator: "Exists"
           effect: "NoSchedule"
+        - key: "CriticalAddonsOnly"
+          operator: "Exists"
+          effect: "NoSchedule"
       containers:
         - name: csi-provisioner
           image: mcr.microsoft.com/oss/kubernetes-csi/csi-provisioner:v5.1.0
diff --git a/deploy/v1.24.5/csi-blob-node.yaml b/deploy/v1.24.5/csi-blob-node.yaml
index ff9d07c3f..fec18690d 100644
--- a/deploy/v1.24.5/csi-blob-node.yaml
+++ b/deploy/v1.24.5/csi-blob-node.yaml
@@ -136,7 +136,7 @@ spec:
           args:
             - "--v=5"
             - "--endpoint=$(CSI_ENDPOINT)"
-            - "--enable-blobfuse-proxy=false"
+            - "--enable-blobfuse-proxy=true"
             - "--blobfuse-proxy-endpoint=$(BLOBFUSE_PROXY_ENDPOINT)"
             - "--nodeid=$(KUBE_NODE_NAME)"
             - "--user-agent-suffix=OSS-kubectl"
diff --git a/deploy/v1.25.0/csi-blob-controller.yaml b/deploy/v1.25.0/csi-blob-controller.yaml
index 16c1b67b9..3ab60722b 100644
--- a/deploy/v1.25.0/csi-blob-controller.yaml
+++ b/deploy/v1.25.0/csi-blob-controller.yaml
@@ -32,6 +32,9 @@ spec:
         - key: "node-role.kubernetes.io/control-plane"
           operator: "Exists"
           effect: "NoSchedule"
+        - key: "CriticalAddonsOnly"
+          operator: "Exists"
+          effect: "NoSchedule"
       containers:
         - name: csi-provisioner
           image: mcr.microsoft.com/oss/kubernetes-csi/csi-provisioner:v5.1.0