diff --git a/helm/amd-gpu/Chart.yaml b/helm/amd-gpu/Chart.yaml
index 08f037698ea9690ccba2e917b828bb7caf796d20..57c21f1713cc4fe314e78fc8749ee17cc601096e 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.3.0
+version: 0.4.0
 appVersion: "1.18.0"
 
 dependencies:
diff --git a/helm/amd-gpu/templates/deviceplugin-daemonset.yaml b/helm/amd-gpu/templates/deviceplugin-daemonset.yaml
index b7c94e03370c3228ecf6d414f07e5baa579761d4..833f6298fbbdb72cf0b3a5d57033dcf58268a863 100644
--- a/helm/amd-gpu/templates/deviceplugin-daemonset.yaml
+++ b/helm/amd-gpu/templates/deviceplugin-daemonset.yaml
@@ -9,8 +9,6 @@ spec:
       name: {{ .Chart.Name }}-dp-ds
   template:
     metadata:
-      annotations:
-        scheduler.alpha.kubernetes.io/critical-pod: ""
       labels:
         name: {{ .Chart.Name }}-dp-ds
     spec:
@@ -24,6 +22,7 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       {{- end }}
+      priorityClassName: system-node-critical
       {{- with .Values.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
diff --git a/helm/amd-gpu/templates/labeller.yaml b/helm/amd-gpu/templates/labeller.yaml
index eec35b9ef7572e8cb75d77caf54c983a7deb0356..caaeec0b2dce993c5b452a5ffcd2d3885b6f4732 100644
--- a/helm/amd-gpu/templates/labeller.yaml
+++ b/helm/amd-gpu/templates/labeller.yaml
@@ -36,8 +36,6 @@ spec:
       name: amdgpu-lr-ds
   template:
     metadata:
-      annotations:
-        scheduler.alpha.kubernetes.io/critical-pod: ""
       labels:
         name: amdgpu-lr-ds
     spec:
@@ -47,6 +45,7 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       {{- end }}
+      priorityClassName: system-node-critical
       {{- with .Values.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
diff --git a/k8s-ds-amdgpu-dp-health.yaml b/k8s-ds-amdgpu-dp-health.yaml
index 6e3beb22194bbeb3939a85dd9c9bca8e73013b66..f3224e9fe8ab6246e717647bb5e370ce148dda97 100644
--- a/k8s-ds-amdgpu-dp-health.yaml
+++ b/k8s-ds-amdgpu-dp-health.yaml
@@ -15,11 +15,10 @@ spec:
       name: amdgpu-dp-ds
   template:
     metadata:
-      annotations:
-        scheduler.alpha.kubernetes.io/critical-pod: ""
       labels:
         name: amdgpu-dp-ds
     spec:
+      priorityClassName: system-node-critical
       tolerations:
       - key: CriticalAddonsOnly
         operator: Exists
diff --git a/k8s-ds-amdgpu-dp.yaml b/k8s-ds-amdgpu-dp.yaml
index 6a72c26a787211f1f1fd6007932a372138efdcbe..cfa5de54a2c49fa7e1aa46e2a3da254c6521fc85 100644
--- a/k8s-ds-amdgpu-dp.yaml
+++ b/k8s-ds-amdgpu-dp.yaml
@@ -9,11 +9,10 @@ spec:
       name: amdgpu-dp-ds
   template:
     metadata:
-      annotations:
-        scheduler.alpha.kubernetes.io/critical-pod: ""
       labels:
         name: amdgpu-dp-ds
     spec:
+      priorityClassName: system-node-critical
       tolerations:
       - key: CriticalAddonsOnly
         operator: Exists
diff --git a/k8s-ds-amdgpu-labeller.yaml b/k8s-ds-amdgpu-labeller.yaml
index 55b01c3691ec0a629a7bb8375a95cdd8cbd2e01d..5da80b796c4c7d240f2c78d613aa0ff07c2e8b64 100644
--- a/k8s-ds-amdgpu-labeller.yaml
+++ b/k8s-ds-amdgpu-labeller.yaml
@@ -38,11 +38,10 @@ spec:
       name: amdgpu-lr-ds
   template:
     metadata:
-      annotations:
-        scheduler.alpha.kubernetes.io/critical-pod: ""
       labels:
         name: amdgpu-lr-ds
     spec:
+      priorityClassName: system-node-critical
       tolerations:
       - key: CriticalAddonsOnly
         operator: Exists