diff --git a/helm/amd-gpu/README.md b/helm/amd-gpu/README.md
index 7c8523a7..0db7fca3 100644
--- a/helm/amd-gpu/README.md
+++ b/helm/amd-gpu/README.md
@@ -24,7 +24,6 @@ Kubernetes: `>= 1.18.0`
 | labeller.enabled | bool | `false` |  |
 | lbl.image.repository | string | `"docker.io/rocm/k8s-device-plugin"` |  |
 | 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"` |  |
diff --git a/helm/amd-gpu/templates/NOTES.txt b/helm/amd-gpu/templates/NOTES.txt
index 9a3bf4ba..9249ef40 100644
--- a/helm/amd-gpu/templates/NOTES.txt
+++ b/helm/amd-gpu/templates/NOTES.txt
@@ -1,4 +1,4 @@
-{{ .Chart.Name }}-device-plugin-daemonset deployed in namespace '{{ .Values.namespace }}'
+{{ .Chart.Name }}-device-plugin-daemonset deployed in namespace '{{ .Release.Namespace }}'
 {{- if .Values.labeller.enabled }}
-{{ .Chart.Name }}-labeller-daemonset deployed in namespace '{{ .Values.namespace }}'
+{{ .Chart.Name }}-labeller-daemonset deployed in namespace '{{ .Release.Namespace }}'
 {{- end }}
diff --git a/helm/amd-gpu/templates/deviceplugin-daemonset.yaml b/helm/amd-gpu/templates/deviceplugin-daemonset.yaml
index bf6a181d..d36ddb4a 100644
--- a/helm/amd-gpu/templates/deviceplugin-daemonset.yaml
+++ b/helm/amd-gpu/templates/deviceplugin-daemonset.yaml
@@ -2,7 +2,6 @@ apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: {{ .Chart.Name }}-device-plugin-daemonset
-  namespace: {{ .Values.namespace }}
 spec:
   selector:
     matchLabels:
diff --git a/helm/amd-gpu/templates/labeller.yaml b/helm/amd-gpu/templates/labeller.yaml
index 6e0a2a76..8a31b957 100644
--- a/helm/amd-gpu/templates/labeller.yaml
+++ b/helm/amd-gpu/templates/labeller.yaml
@@ -12,7 +12,6 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: crb-{{ .Chart.Name }}-labeller
-  namespace: default
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
@@ -20,16 +19,12 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: default
-  namespace: default
-- kind: ServiceAccount
-  name: default
-  namespace: {{ .Values.namespace }}
+  namespace: {{ .Release.Namespace }}
 ---
 apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: {{ .Chart.Name }}-labeller-daemonset
-  namespace: {{ .Values.namespace }}
 spec:
   selector:
     matchLabels:
diff --git a/helm/amd-gpu/values.yaml b/helm/amd-gpu/values.yaml
index 56cc0dc5..84370066 100644
--- a/helm/amd-gpu/values.yaml
+++ b/helm/amd-gpu/values.yaml
@@ -4,8 +4,6 @@ nfd:
 labeller:
   enabled: false
 
-namespace: kube-system
-
 dp:
   image:
     repository: docker.io/rocm/k8s-device-plugin