diff --git a/images/sriov-cni-daemonset.yaml b/images/sriov-cni-daemonset.yaml
index 6c2cf1793..b5c0936b3 100644
--- a/images/sriov-cni-daemonset.yaml
+++ b/images/sriov-cni-daemonset.yaml
@@ -2,7 +2,7 @@
 apiVersion: apps/v1
 kind: DaemonSet
 metadata:
-  name: kube-sriov-cni-ds-amd64
+  name: kube-sriov-cni-ds
   namespace: kube-system
   labels:
     tier: node
@@ -18,12 +18,13 @@ spec:
         tier: node
         app: sriov-cni
     spec:
-      nodeSelector:
-        kubernetes.io/arch: amd64
       tolerations:
       - key: node-role.kubernetes.io/master
         operator: Exists
         effect: NoSchedule
+      - key: node-role.kubernetes.io/control-plane
+        operator: Exists
+        effect: NoSchedule
       containers:
       - name: kube-sriov-cni
         image: ghcr.io/k8snetworkplumbingwg/sriov-cni