diff --git a/Makefile b/Makefile
index 6cd34b4d..1fa95c73 100644
--- a/Makefile
+++ b/Makefile
@@ -74,7 +74,7 @@ clean:
 	rm -f $(BIN)
 
 clean-labels:
-	@$(shell kubectl get no -o yaml | sed -e '/^\s*nfd.node.kubernetes.io/d' -e '/^\s*feature.node.kubernetes.io/d' | kubectl replace -f -)
+	kubectl get no -o yaml | sed -e '/^\s*nfd.node.kubernetes.io/d' -e '/^\s*feature.node.kubernetes.io/d' | kubectl replace -f -
 
 image:
 	$(IMAGE_BUILD_CMD) -t $(IMAGE_TAG) \
diff --git a/assets/worker/0700_worker_daemonset.yaml b/assets/worker/0700_worker_daemonset.yaml
index cf5b5bed..710bfcfa 100644
--- a/assets/worker/0700_worker_daemonset.yaml
+++ b/assets/worker/0700_worker_daemonset.yaml
@@ -13,8 +13,16 @@ spec:
       labels:
         app: nfd-worker
     spec:
-      nodeSelector:
-        node-role.kubernetes.io/worker: ""
+      tolerations:
+      - operator: "Exists"
+        effect: "NoSchedule"
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+            - matchExpressions:
+              - key:  node-role.kubernetes.io/master
+                operator: DoesNotExist
       hostNetwork: true
       serviceAccount: nfd-worker
       readOnlyRootFilesystem: true