diff --git a/helm/amd-gpu/values.yaml b/helm/amd-gpu/values.yaml
index 4f56c740408f82d1d13588dffcce292f29c3bd8e..d1bdce338b255c2afd6738ca594955f697a23211 100644
--- a/helm/amd-gpu/values.yaml
+++ b/helm/amd-gpu/values.yaml
@@ -33,3 +33,4 @@ tolerations:
 
 node_selector:
   feature.node.kubernetes.io/pci-0300_1002.present: "true"
+  kubernetes.io/arch: amd64
diff --git a/k8s-ds-amdgpu-dp-health.yaml b/k8s-ds-amdgpu-dp-health.yaml
index f3224e9fe8ab6246e717647bb5e370ce148dda97..cd324cf1379daece8f9a1e275dfba58425a7d3c7 100644
--- a/k8s-ds-amdgpu-dp-health.yaml
+++ b/k8s-ds-amdgpu-dp-health.yaml
@@ -18,6 +18,8 @@ spec:
       labels:
         name: amdgpu-dp-ds
     spec:
+      nodeSelector:
+        kubernetes.io/arch: amd64
       priorityClassName: system-node-critical
       tolerations:
       - key: CriticalAddonsOnly
diff --git a/k8s-ds-amdgpu-dp.yaml b/k8s-ds-amdgpu-dp.yaml
index cfa5de54a2c49fa7e1aa46e2a3da254c6521fc85..d3a7f166bc7af60de7c2dee723056f7746fc707a 100644
--- a/k8s-ds-amdgpu-dp.yaml
+++ b/k8s-ds-amdgpu-dp.yaml
@@ -12,6 +12,8 @@ spec:
       labels:
         name: amdgpu-dp-ds
     spec:
+      nodeSelector:
+        kubernetes.io/arch: amd64
       priorityClassName: system-node-critical
       tolerations:
       - key: CriticalAddonsOnly
diff --git a/k8s-ds-amdgpu-labeller.yaml b/k8s-ds-amdgpu-labeller.yaml
index 5da80b796c4c7d240f2c78d613aa0ff07c2e8b64..e2f407823dcd6f9d963b39ab5633d5aead67115d 100644
--- a/k8s-ds-amdgpu-labeller.yaml
+++ b/k8s-ds-amdgpu-labeller.yaml
@@ -1,5 +1,5 @@
 # This is a configuration example for the node labeller which includes
-# ClusterRole and ClusterRoleBinding definitions, as well as the 
+# ClusterRole and ClusterRoleBinding definitions, as well as the
 # DeamonSet configuration that deploys the actual node labeller
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
@@ -41,6 +41,8 @@ spec:
       labels:
         name: amdgpu-lr-ds
     spec:
+      nodeSelector:
+        kubernetes.io/arch: amd64
       priorityClassName: system-node-critical
       tolerations:
       - key: CriticalAddonsOnly