diff --git a/charts/internal/seed-controlplane/charts/csi-hcloud/templates/hcloud-csi-controller.yaml b/charts/internal/seed-controlplane/charts/csi-hcloud/templates/hcloud-csi-controller.yaml
index dd1c180ca..4cde6cce1 100644
--- a/charts/internal/seed-controlplane/charts/csi-hcloud/templates/hcloud-csi-controller.yaml
+++ b/charts/internal/seed-controlplane/charts/csi-hcloud/templates/hcloud-csi-controller.yaml
@@ -169,6 +169,8 @@ spec:
             allowPrivilegeEscalation: true
         - name: liveness-probe
           image: {{ index .Values.images "liveness-probe" }}
+          args:
+            - --csi-address=/run/csi/socket
 {{- if .Values.resources.liveness }}
           resources:
 {{ toYaml .Values.resources.liveness | indent 12 }}
diff --git a/charts/internal/shoot-system-components/charts/csi-hcloud/templates/daemonset.yaml b/charts/internal/shoot-system-components/charts/csi-hcloud/templates/daemonset.yaml
index 6acc4d7ee..95198b34c 100644
--- a/charts/internal/shoot-system-components/charts/csi-hcloud/templates/daemonset.yaml
+++ b/charts/internal/shoot-system-components/charts/csi-hcloud/templates/daemonset.yaml
@@ -28,15 +28,6 @@ spec:
           operator: Exists
         - key: CriticalAddonsOnly
           operator: Exists
-      affinity:
-        nodeAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-            nodeSelectorTerms:
-              - matchExpressions:
-                  - key: "instance.hetzner.cloud/is-root-server"
-                    operator: NotIn
-                    values:
-                      - "true"
       containers:
         - name: csi-node-driver-registrar
           image: {{ index .Values.images "csi-node-driver-registrar" }}
@@ -103,6 +94,8 @@ spec:
             periodSeconds: 2
         - name: liveness-probe
           image: {{ index .Values.images "liveness-probe" }}
+          args:
+            - --csi-address=/run/csi/socket
           volumeMounts:
             - mountPath: /run/csi
               name: plugin-dir