diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
index 1f979e7a..0f4f128e 100644
--- a/config/manager/manager.yaml
+++ b/config/manager/manager.yaml
@@ -30,7 +30,7 @@ spec:
             capabilities:
               drop: ["ALL"]
           command:
-            - /manager
+            - /node-feature-discovery-operator
           args:
             - --leader-elect
             - "--zap-encoder=console"
diff --git a/controllers/nodefeaturediscovery_state.go b/controllers/nodefeaturediscovery_state.go
index 55041a1a..c9184ac7 100644
--- a/controllers/nodefeaturediscovery_state.go
+++ b/controllers/nodefeaturediscovery_state.go
@@ -44,8 +44,10 @@ func (n *NFD) init(
 	n.rec = r
 	n.ins = i
 	n.idx = 0
-	n.addState("/opt/nfd/master")
-	n.addState("/opt/nfd/worker")
+	if len(n.controls) == 0 {
+		n.addState("/opt/nfd/master")
+		n.addState("/opt/nfd/worker")
+	}
 }
 
 func (n *NFD) step() error {