diff --git a/helm/amd-gpu/Chart.yaml b/helm/amd-gpu/Chart.yaml
index 1f154a1e..3822cbd2 100644
--- a/helm/amd-gpu/Chart.yaml
+++ b/helm/amd-gpu/Chart.yaml
@@ -15,7 +15,7 @@ keywords:
   - gpu
 
 kubeVersion: ">= 1.18.0-0"
-version: 0.8.0
+version: 0.8.1
 appVersion: "1.25.2.3"
 
 dependencies:
diff --git a/helm/amd-gpu/README.md b/helm/amd-gpu/README.md
index 44a6ad88..aa3d7876 100644
--- a/helm/amd-gpu/README.md
+++ b/helm/amd-gpu/README.md
@@ -1,40 +1,51 @@
-# AMD GPU Helm Chart
+# amd-gpu
 
-![Version: 0.8.0](https://img.shields.io/badge/Version-0.8.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.25.2.3](https://img.shields.io/badge/AppVersion-1.25.2.3-informational?style=flat-square)
+![Version: 0.8.1](https://img.shields.io/badge/Version-0.8.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.25.2.3](https://img.shields.io/badge/AppVersion-1.25.2.3-informational?style=flat-square)
 
 A Helm chart for deploying Kubernetes AMD GPU device plugin
 
-## Requirements
+**Homepage:** <https://github.com/RadeonOpenCompute/k8s-device-plugin>
+
+## Maintainers
+
+| Name | Email | Url |
+| ---- | ------ | --- |
+| Kenny Ho <Kenny.Ho@amd.com> |  |  |
+
+## Source Code
 
-Kubernetes: `>= 1.18.0`
+* <https://github.com/RadeonOpenCompute/k8s-device-plugin>
 
-## Optional Dependencies
+## Requirements
+
+Kubernetes: `>= 1.18.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
-| https://kubernetes-sigs.github.io/node-feature-discovery/charts | node-feature-discovery | 0.8.1 |
+| https://kubernetes-sigs.github.io/node-feature-discovery/charts | node-feature-discovery | >= 0.8.1-0 |
 
 ## Values
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | dp.image.repository | string | `"docker.io/rocm/k8s-device-plugin"` |  |
-| dp.image.tag | string | `""` |  |
+| dp.image.tag | string | `"1.25.2.3"` |  |
+| dp.podAnnotations | object | `{}` |  |
+| dp.podLabels | object | `{}` |  |
+| dp.resources | object | `{}` |  |
 | imagePullSecrets | list | `[]` |  |
 | labeller.enabled | bool | `false` |  |
 | lbl.image.repository | string | `"docker.io/rocm/k8s-device-plugin"` |  |
-| lbl.image.tag | string | `"labeller-latest"` |  |
+| lbl.image.tag | string | `"labeller-1.25.2.3"` |  |
+| lbl.podAnnotations | object | `{}` |  |
+| lbl.podLabels | object | `{}` |  |
+| lbl.resources | object | `{}` |  |
 | namespace | string | `"kube-system"` |  |
 | nfd.enabled | bool | `false` |  |
 | node_selector."feature.node.kubernetes.io/pci-0300_1002.present" | string | `"true"` |  |
+| node_selector."kubernetes.io/arch" | string | `"amd64"` |  |
 | securityContext.allowPrivilegeEscalation | bool | `false` |  |
 | securityContext.capabilities.drop[0] | string | `"ALL"` |  |
 | tolerations[0].key | string | `"CriticalAddonsOnly"` |  |
 | tolerations[0].operator | string | `"Exists"` |  |
 
-## More information
-
-https://github.com/RadeonOpenCompute/k8s-device-plugin
-
-----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.5.0](https://github.com/norwoodj/helm-docs/releases/v1.5.0)
diff --git a/helm/amd-gpu/templates/deviceplugin-daemonset.yaml b/helm/amd-gpu/templates/deviceplugin-daemonset.yaml
index 833f6298..f7e39ba6 100644
--- a/helm/amd-gpu/templates/deviceplugin-daemonset.yaml
+++ b/helm/amd-gpu/templates/deviceplugin-daemonset.yaml
@@ -11,6 +11,13 @@ spec:
     metadata:
       labels:
         name: {{ .Chart.Name }}-dp-ds
+{{- with .Values.dp.podLabels }}
+{{- toYaml . | nindent 8 }}
+{{- end }}
+{{- with .Values.dp.podAnnotations }}
+      annotations:
+{{ toYaml . | indent 8 }}
+{{- end }}
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
diff --git a/helm/amd-gpu/templates/labeller.yaml b/helm/amd-gpu/templates/labeller.yaml
index caaeec0b..5ab9810b 100644
--- a/helm/amd-gpu/templates/labeller.yaml
+++ b/helm/amd-gpu/templates/labeller.yaml
@@ -38,6 +38,13 @@ spec:
     metadata:
       labels:
         name: amdgpu-lr-ds
+{{- with .Values.lbl.podLabels }}
+{{- toYaml . | nindent 8 }}
+{{- end }}
+{{- with .Values.lbl.podAnnotations }}
+      annotations:
+{{ toYaml . | indent 8 }}
+{{- end }}
     spec:
       {{- if .Values.nfd.enabled }}
       {{- with .Values.node_selector }}
diff --git a/helm/amd-gpu/values.yaml b/helm/amd-gpu/values.yaml
index 51e31011..2fee2ff9 100644
--- a/helm/amd-gpu/values.yaml
+++ b/helm/amd-gpu/values.yaml
@@ -12,12 +12,16 @@ dp:
     # Overrides the image tag whose default is the chart appVersion.
     tag: "1.25.2.3"
   resources: {}
+  podLabels: {}
+  podAnnotations: {}
 
 lbl:
   image:
     repository: docker.io/rocm/k8s-device-plugin
     tag: "labeller-1.25.2.3"
   resources: {}
+  podLabels: {}
+  podAnnotations: {}
 
 imagePullSecrets: []