diff --git a/ansible/roles/csi/tasks/main.yml b/ansible/roles/csi/tasks/main.yml
index caca0db..66e6ed4 100644
--- a/ansible/roles/csi/tasks/main.yml
+++ b/ansible/roles/csi/tasks/main.yml
@@ -13,6 +13,14 @@
   command: kubectl apply -f {{ csi_manifest_url }}
   changed_when: true
 
+- name: Ensure CSI controller endpoint is set for sidecars
+  command: kubectl -n kube-system set env deployment/hcloud-csi-controller CSI_ENDPOINT=unix:///run/csi/socket
+  changed_when: true
+
+- name: Ensure CSI node endpoint is set for sidecars
+  command: kubectl -n kube-system set env daemonset/hcloud-csi-node CSI_ENDPOINT=unix:///run/csi/socket
+  changed_when: true
+
 - name: Restart CSI controller to pick up current secret
   command: kubectl -n kube-system rollout restart deployment/hcloud-csi-controller
   changed_when: true