diff --git a/templates/agent/daemonset.yaml b/templates/agent/daemonset.yaml
index db681713..17d1595c 100644
--- a/templates/agent/daemonset.yaml
+++ b/templates/agent/daemonset.yaml
@@ -18,8 +18,25 @@ spec:
     spec:
       {{- include "helm_lib_priority_class" (tuple . "cluster-medium") | nindent 6 }}
       {{- include "helm_lib_tolerations" (tuple . "any-node" "storage-problems") | nindent 6 }}
-      nodeSelector:
-        storage.deckhouse.io/sds-drbd-node: ""
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+              - matchExpressions:
+                  - key: storage.deckhouse.io/sds-replicated-volume-node
+                    operator: In
+                    values:
+                      - ""
+              - matchExpressions:
+                  - key: storage.deckhouse.io/sds-local-volume-node
+                    operator: In
+                    values:
+                      - ""
+              - matchExpressions:
+                  - key: storage.deckhouse.io/sds-drbd-node
+                    operator: In
+                    values:
+                      - ""
       imagePullSecrets:
         - name: {{ .Chart.Name }}-module-registry
       serviceAccountName: sds-node-configurator