diff --git a/helm/amd-gpu/README.md b/helm/amd-gpu/README.md
index c94f53dd68d73dfec5786194162642910b8e5730..6a817d9aff095f438d9ed84bdba8ca6b4de4163f 100644
--- a/helm/amd-gpu/README.md
+++ b/helm/amd-gpu/README.md
@@ -26,6 +26,7 @@ Kubernetes: `>= 1.18.0`
 | lbl.image.tag | string | `"labeller-latest"` |  |
 | namespace | string | `"kube-system"` |  |
 | nfd.enabled | bool | `false` |  |
+| node_selector_enabled | bool | `false` |  |
 | node_selector."feature.node.kubernetes.io/pci-0300_1002.present" | string | `"true"` |  |
 | securityContext.allowPrivilegeEscalation | bool | `false` |  |
 | securityContext.capabilities.drop[0] | string | `"ALL"` |  |
diff --git a/helm/amd-gpu/templates/deviceplugin-daemonset.yaml b/helm/amd-gpu/templates/deviceplugin-daemonset.yaml
index 833f6298fbbdb72cf0b3a5d57033dcf58268a863..bf6a181deb313b4b766ebae51a01f3c505f5612c 100644
--- a/helm/amd-gpu/templates/deviceplugin-daemonset.yaml
+++ b/helm/amd-gpu/templates/deviceplugin-daemonset.yaml
@@ -16,7 +16,7 @@ spec:
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- if .Values.nfd.enabled }}
+      {{- if .Values.node_selector_enabled }}
       {{- with .Values.node_selector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
diff --git a/helm/amd-gpu/templates/labeller.yaml b/helm/amd-gpu/templates/labeller.yaml
index 4f4fd22b2d8e1fa3826022f20f587a3529674a6b..6e0a2a76e265bb66c2fdb66a71cf7cb5fb83f507 100644
--- a/helm/amd-gpu/templates/labeller.yaml
+++ b/helm/amd-gpu/templates/labeller.yaml
@@ -39,7 +39,7 @@ spec:
       labels:
         name: amdgpu-lr-ds
     spec:
-      {{- if .Values.nfd.enabled }}
+      {{- if .Values.node_selector_enabled }}
       {{- with .Values.node_selector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
diff --git a/helm/amd-gpu/values.yaml b/helm/amd-gpu/values.yaml
index 361afafdc537d5f1a10e8a5ab9bb9138af429848..ac749eca102972ae7dfef46dcda8284a65d4b220 100644
--- a/helm/amd-gpu/values.yaml
+++ b/helm/amd-gpu/values.yaml
@@ -31,6 +31,7 @@ tolerations:
   - key: CriticalAddonsOnly
     operator: Exists
 
+node_selector_enabled: false
 node_selector:
   feature.node.kubernetes.io/pci-0300_1002.present: "true"
   kubernetes.io/arch: amd64