diff --git a/deploy/helm/templates/attacher.yaml b/deploy/helm/templates/attacher.yaml
index c825406..ccf6502 100644
--- a/deploy/helm/templates/attacher.yaml
+++ b/deploy/helm/templates/attacher.yaml
@@ -79,6 +79,13 @@ spec:
       tolerations:
       - key: node-role.kubernetes.io/master
         operator: "Exists"
+      affinity:
+        podAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+          - labelSelector:
+              matchLabels:
+                  app: csi-provisioner-s3
+            topologyKey: kubernetes.io/hostname
       containers:
         - name: csi-attacher
           image: {{ .Values.images.attacher }}
diff --git a/deploy/helm/templates/provisioner.yaml b/deploy/helm/templates/provisioner.yaml
index 46d0bb8..13b2986 100644
--- a/deploy/helm/templates/provisioner.yaml
+++ b/deploy/helm/templates/provisioner.yaml
@@ -56,6 +56,8 @@ kind: StatefulSet
 apiVersion: apps/v1
 metadata:
   name: csi-provisioner-s3
+  labels:
+    app: csi-provisioner-s3
   namespace: {{ .Release.Namespace }}
 spec:
   serviceName: "csi-provisioner-s3"
@@ -112,4 +114,6 @@ spec:
               mountPath: /var/lib/kubelet/plugins/ru.yandex.s3.csi
       volumes:
         - name: socket-dir
-          emptyDir: {}
+          hostPath:
+            path: /var/lib/kubelet/plugins/ru.yandex.s3.csi
+            type: DirectoryOrCreate