diff --git a/packages/apps/kubernetes/templates/helmreleases/gpu-operator.yaml b/packages/apps/kubernetes/templates/helmreleases/gpu-operator.yaml
index 995aa430..7a5ecaf1 100644
--- a/packages/apps/kubernetes/templates/helmreleases/gpu-operator.yaml
+++ b/packages/apps/kubernetes/templates/helmreleases/gpu-operator.yaml
@@ -1,5 +1,5 @@
 {{- define "cozystack.defaultGpuOperatorValues" -}}
-{{- if and (hasKey .Values.addons "hami") .Values.addons.hami.enabled }}
+{{- if .Values.addons.hami.enabled }}
 gpu-operator:
   devicePlugin:
     enabled: false
@@ -40,10 +40,8 @@ spec:
   {{- $defaults := fromYaml (include "cozystack.defaultGpuOperatorValues" .) }}
   {{- $overrides := deepCopy (default (dict) .Values.addons.gpuOperator.valuesOverride) }}
   {{- $merged := mergeOverwrite (default (dict) $defaults) $overrides }}
-  {{- with $merged }}
   values:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
+    {{- if $merged }}{{ toYaml $merged | nindent 4 }}{{ end }}
 
   dependsOn:
   {{- if lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" .Release.Namespace .Release.Name }}
diff --git a/packages/apps/kubernetes/tests/gpu_operator_hami_test.yaml b/packages/apps/kubernetes/tests/gpu_operator_hami_test.yaml
index 33256ae6..11de743a 100644
--- a/packages/apps/kubernetes/tests/gpu_operator_hami_test.yaml
+++ b/packages/apps/kubernetes/tests/gpu_operator_hami_test.yaml
@@ -26,8 +26,9 @@ tests:
           enabled: false
           valuesOverride: {}
     asserts:
-      - notExists:
+      - equal:
           path: spec.values
+          value: null
 
   - it: should allow user overrides to merge with hami defaults
     set:
@@ -66,6 +67,28 @@ tests:
           path: spec.values.gpu-operator.devicePlugin.enabled
           value: true
 
+  - it: should let user explicitly override devicePlugin.enabled to true with hami enabled
+    set:
+      addons:
+        gpuOperator:
+          enabled: true
+          valuesOverride:
+            gpu-operator:
+              devicePlugin:
+                enabled: true
+              driver:
+                enabled: false
+        hami:
+          enabled: true
+          valuesOverride: {}
+    asserts:
+      - equal:
+          path: spec.values.gpu-operator.devicePlugin.enabled
+          value: true
+      - equal:
+          path: spec.values.gpu-operator.driver.enabled
+          value: false
+
   - it: should not render when gpuOperator is disabled
     set:
       addons:
diff --git a/packages/system/hami/charts/hami/Chart.lock b/packages/system/hami/charts/hami/Chart.lock
deleted file mode 100644
index 25856c07..00000000
--- a/packages/system/hami/charts/hami/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: hami-dra
-  repository: https://project-hami.github.io/HAMi-DRA/
-  version: 0.1.0
-digest: sha256:374551539570bcee82c1c4dea93eac59e6f410b6d5967d188efd630e203d43bb
-generated: "2026-04-17T04:06:47.689117678Z"
diff --git a/packages/system/hami/charts/hami/Chart.yaml b/packages/system/hami/charts/hami/Chart.yaml
index aba7e95c..55f32ab6 100644
--- a/packages/system/hami/charts/hami/Chart.yaml
+++ b/packages/system/hami/charts/hami/Chart.yaml
@@ -1,10 +1,6 @@
 apiVersion: v2
 appVersion: 2.8.1
-dependencies:
-- condition: dra.enabled
-  name: hami-dra
-  repository: https://project-hami.github.io/HAMi-DRA/
-  version: 0.1.0
+dependencies: []
 description: Heterogeneous AI Computing Virtualization Middleware
 keywords:
 - vgpu
diff --git a/packages/system/hami/charts/hami/templates/device-plugin/configmap.yaml b/packages/system/hami/charts/hami/templates/device-plugin/configmap.yaml
index b36347f2..db2ddacb 100644
--- a/packages/system/hami/charts/hami/templates/device-plugin/configmap.yaml
+++ b/packages/system/hami/charts/hami/templates/device-plugin/configmap.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.devicePlugin.enabled (not .Values.devicePlugin.nodeConfiguration.externalConfigName) (not .Values.dra.enabled) -}}
+{{- if and .Values.devicePlugin.enabled (not .Values.devicePlugin.nodeConfiguration.externalConfigName) -}}
 apiVersion: v1
 kind: ConfigMap
 metadata:
diff --git a/packages/system/hami/charts/hami/templates/device-plugin/daemonsetnvidia.yaml b/packages/system/hami/charts/hami/templates/device-plugin/daemonsetnvidia.yaml
index 577dc0f9..1f4c24f3 100644
--- a/packages/system/hami/charts/hami/templates/device-plugin/daemonsetnvidia.yaml
+++ b/packages/system/hami/charts/hami/templates/device-plugin/daemonsetnvidia.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.devicePlugin.enabled (not .Values.dra.enabled) }}
+{{- if .Values.devicePlugin.enabled }}
 apiVersion: apps/v1
 kind: DaemonSet
 metadata:
diff --git a/packages/system/hami/charts/hami/templates/device-plugin/monitorrole.yaml b/packages/system/hami/charts/hami/templates/device-plugin/monitorrole.yaml
index c51ff6c6..377f6a86 100644
--- a/packages/system/hami/charts/hami/templates/device-plugin/monitorrole.yaml
+++ b/packages/system/hami/charts/hami/templates/device-plugin/monitorrole.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.devicePlugin.enabled (not .Values.dra.enabled) -}}
+{{- if .Values.devicePlugin.enabled -}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
diff --git a/packages/system/hami/charts/hami/templates/device-plugin/monitorrolebinding.yaml b/packages/system/hami/charts/hami/templates/device-plugin/monitorrolebinding.yaml
index 93a118dd..2f0a14ba 100644
--- a/packages/system/hami/charts/hami/templates/device-plugin/monitorrolebinding.yaml
+++ b/packages/system/hami/charts/hami/templates/device-plugin/monitorrolebinding.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.devicePlugin.enabled (not .Values.dra.enabled) -}}
+{{- if .Values.devicePlugin.enabled -}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
diff --git a/packages/system/hami/charts/hami/templates/device-plugin/monitorservice.yaml b/packages/system/hami/charts/hami/templates/device-plugin/monitorservice.yaml
index 24daca9b..0fb156cc 100644
--- a/packages/system/hami/charts/hami/templates/device-plugin/monitorservice.yaml
+++ b/packages/system/hami/charts/hami/templates/device-plugin/monitorservice.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.devicePlugin.enabled (not .Values.dra.enabled) -}}
+{{- if .Values.devicePlugin.enabled -}}
 apiVersion: v1
 kind: Service
 metadata:
diff --git a/packages/system/hami/charts/hami/templates/device-plugin/monitorserviceaccount.yaml b/packages/system/hami/charts/hami/templates/device-plugin/monitorserviceaccount.yaml
index b10d2cb9..6e3c2a44 100644
--- a/packages/system/hami/charts/hami/templates/device-plugin/monitorserviceaccount.yaml
+++ b/packages/system/hami/charts/hami/templates/device-plugin/monitorserviceaccount.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.devicePlugin.enabled (not .Values.dra.enabled) -}}
+{{- if .Values.devicePlugin.enabled -}}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
diff --git a/packages/system/hami/charts/hami/templates/device-plugin/runtime-class.yaml b/packages/system/hami/charts/hami/templates/device-plugin/runtime-class.yaml
index cd3d14cc..ebcc2c9c 100644
--- a/packages/system/hami/charts/hami/templates/device-plugin/runtime-class.yaml
+++ b/packages/system/hami/charts/hami/templates/device-plugin/runtime-class.yaml
@@ -1,5 +1,4 @@
-{{- if and .Values.devicePlugin.enabled (not .Values.dra.enabled) -}}
-{{- if and .Values.devicePlugin.createRuntimeClass .Values.devicePlugin.runtimeClassName }}
+{{- if and .Values.devicePlugin.enabled .Values.devicePlugin.createRuntimeClass .Values.devicePlugin.runtimeClassName -}}
 apiVersion: node.k8s.io/v1
 kind: RuntimeClass
 metadata:
@@ -7,5 +6,4 @@ metadata:
   annotations:
     helm.sh/hook: pre-install,pre-upgrade
 handler: nvidia
-{{- end }}
 {{- end -}}
diff --git a/packages/system/hami/charts/hami/templates/scheduler/certmanager.yaml b/packages/system/hami/charts/hami/templates/scheduler/certmanager.yaml
index b6edb605..e6d28721 100644
--- a/packages/system/hami/charts/hami/templates/scheduler/certmanager.yaml
+++ b/packages/system/hami/charts/hami/templates/scheduler/certmanager.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.scheduler.admissionWebhook.enabled (not .Values.dra.enabled) -}}
+{{- if .Values.scheduler.admissionWebhook.enabled -}}
 {{- if .Values.scheduler.certManager.enabled }}
 apiVersion: cert-manager.io/v1
 kind: Certificate
diff --git a/packages/system/hami/charts/hami/templates/scheduler/clusterrole.yaml b/packages/system/hami/charts/hami/templates/scheduler/clusterrole.yaml
index 9c510c00..81c4fddf 100644
--- a/packages/system/hami/charts/hami/templates/scheduler/clusterrole.yaml
+++ b/packages/system/hami/charts/hami/templates/scheduler/clusterrole.yaml
@@ -1,4 +1,3 @@
-{{- if not .Values.dra.enabled -}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
@@ -33,4 +32,3 @@ rules:
     resources: ["nodes"]
     verbs: ["get", "update", "list", "patch"]
 {{- end -}}
-{{- end }}
diff --git a/packages/system/hami/charts/hami/templates/scheduler/clusterrolebinding.yaml b/packages/system/hami/charts/hami/templates/scheduler/clusterrolebinding.yaml
index 69d75986..aa0f3c66 100644
--- a/packages/system/hami/charts/hami/templates/scheduler/clusterrolebinding.yaml
+++ b/packages/system/hami/charts/hami/templates/scheduler/clusterrolebinding.yaml
@@ -1,4 +1,3 @@
-{{- if not .Values.dra.enabled -}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
@@ -45,5 +44,4 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: {{ include "hami-vgpu.scheduler" . }}
-    namespace: {{ include "hami-vgpu.namespace" . }}
-{{- end }}
\ No newline at end of file
+    namespace: {{ include "hami-vgpu.namespace" . }}
\ No newline at end of file
diff --git a/packages/system/hami/charts/hami/templates/scheduler/configmap.yaml b/packages/system/hami/charts/hami/templates/scheduler/configmap.yaml
index 75889146..109ecbce 100644
--- a/packages/system/hami/charts/hami/templates/scheduler/configmap.yaml
+++ b/packages/system/hami/charts/hami/templates/scheduler/configmap.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.scheduler.kubeScheduler.enabled (not .Values.dra.enabled) -}}
+{{- if .Values.scheduler.kubeScheduler.enabled -}}
 apiVersion: v1
 kind: ConfigMap
 metadata:
diff --git a/packages/system/hami/charts/hami/templates/scheduler/configmapnew.yaml b/packages/system/hami/charts/hami/templates/scheduler/configmapnew.yaml
index e2a91d8b..6f6db097 100644
--- a/packages/system/hami/charts/hami/templates/scheduler/configmapnew.yaml
+++ b/packages/system/hami/charts/hami/templates/scheduler/configmapnew.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.scheduler.kubeScheduler.enabled (not .Values.dra.enabled) -}}
+{{- if .Values.scheduler.kubeScheduler.enabled -}}
 apiVersion: v1
 kind: ConfigMap
 metadata:
diff --git a/packages/system/hami/charts/hami/templates/scheduler/deployment.yaml b/packages/system/hami/charts/hami/templates/scheduler/deployment.yaml
index 6364cae3..12911a42 100644
--- a/packages/system/hami/charts/hami/templates/scheduler/deployment.yaml
+++ b/packages/system/hami/charts/hami/templates/scheduler/deployment.yaml
@@ -1,4 +1,3 @@
-{{- if not .Values.dra.enabled -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -223,5 +222,4 @@ spec:
       {{- end }}
       {{- if .Values.scheduler.nodeName }}
       nodeName: {{ .Values.scheduler.nodeName }}
-      {{- end }}
-{{- end }}
\ No newline at end of file
+      {{- end }}
\ No newline at end of file
diff --git a/packages/system/hami/charts/hami/templates/scheduler/device-configmap.yaml b/packages/system/hami/charts/hami/templates/scheduler/device-configmap.yaml
index ccb945ac..8738a06f 100644
--- a/packages/system/hami/charts/hami/templates/scheduler/device-configmap.yaml
+++ b/packages/system/hami/charts/hami/templates/scheduler/device-configmap.yaml
@@ -1,4 +1,3 @@
-{{- if not .Values.dra.enabled -}}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -406,5 +405,4 @@ data:
           memory: 12288
           aiCore: 4
           aiCPU: 4
-  {{ end }}
-{{- end }}
\ No newline at end of file
+  {{ end }}
\ No newline at end of file
diff --git a/packages/system/hami/charts/hami/templates/scheduler/job-patch/clusterrole.yaml b/packages/system/hami/charts/hami/templates/scheduler/job-patch/clusterrole.yaml
index b089ae82..412b1094 100644
--- a/packages/system/hami/charts/hami/templates/scheduler/job-patch/clusterrole.yaml
+++ b/packages/system/hami/charts/hami/templates/scheduler/job-patch/clusterrole.yaml
@@ -1,5 +1,4 @@
-{{- if and .Values.scheduler.admissionWebhook.enabled (not .Values.dra.enabled) -}}
-{{- if and (.Values.scheduler.patch.enabled) (not .Values.scheduler.certManager.enabled) }}
+{{- if and .Values.scheduler.admissionWebhook.enabled (.Values.scheduler.patch.enabled) (not .Values.scheduler.certManager.enabled) -}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
@@ -27,4 +26,3 @@ rules:
     - {{ include "hami-vgpu.fullname" . }}-admission
 {{- end }}
 {{- end }}
-{{- end }}
diff --git a/packages/system/hami/charts/hami/templates/scheduler/job-patch/clusterrolebinding.yaml b/packages/system/hami/charts/hami/templates/scheduler/job-patch/clusterrolebinding.yaml
index 64f01ecf..2b82f926 100644
--- a/packages/system/hami/charts/hami/templates/scheduler/job-patch/clusterrolebinding.yaml
+++ b/packages/system/hami/charts/hami/templates/scheduler/job-patch/clusterrolebinding.yaml
@@ -1,5 +1,4 @@
-{{- if and .Values.scheduler.admissionWebhook.enabled (not .Values.dra.enabled) -}}
-{{- if and (.Values.scheduler.patch.enabled) (not .Values.scheduler.certManager.enabled) }}
+{{- if and .Values.scheduler.admissionWebhook.enabled (.Values.scheduler.patch.enabled) (not .Values.scheduler.certManager.enabled) -}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
@@ -19,4 +18,3 @@ subjects:
     name: {{ include "hami-vgpu.fullname" . }}-admission
     namespace: {{ include "hami-vgpu.namespace" . }}
 {{- end }}
-{{- end }}
diff --git a/packages/system/hami/charts/hami/templates/scheduler/job-patch/job-createSecret.yaml b/packages/system/hami/charts/hami/templates/scheduler/job-patch/job-createSecret.yaml
index 400168a7..0e36d95f 100644
--- a/packages/system/hami/charts/hami/templates/scheduler/job-patch/job-createSecret.yaml
+++ b/packages/system/hami/charts/hami/templates/scheduler/job-patch/job-createSecret.yaml
@@ -1,5 +1,4 @@
-{{- if and .Values.scheduler.admissionWebhook.enabled (not .Values.dra.enabled) -}}
-{{- if and (.Values.scheduler.patch.enabled) (not .Values.scheduler.certManager.enabled) }}
+{{- if and .Values.scheduler.admissionWebhook.enabled (.Values.scheduler.patch.enabled) (not .Values.scheduler.certManager.enabled) -}}
 apiVersion: batch/v1
 kind: Job
 metadata:
@@ -67,4 +66,3 @@ spec:
         runAsNonRoot: true
         runAsUser: {{ .Values.scheduler.patch.runAsUser }}
 {{- end }}
-{{- end }}
diff --git a/packages/system/hami/charts/hami/templates/scheduler/job-patch/job-patchWebhook.yaml b/packages/system/hami/charts/hami/templates/scheduler/job-patch/job-patchWebhook.yaml
index 71e97f6b..ce52042c 100644
--- a/packages/system/hami/charts/hami/templates/scheduler/job-patch/job-patchWebhook.yaml
+++ b/packages/system/hami/charts/hami/templates/scheduler/job-patch/job-patchWebhook.yaml
@@ -1,5 +1,4 @@
-{{- if and .Values.scheduler.admissionWebhook.enabled (not .Values.dra.enabled) -}}
-{{- if and (.Values.scheduler.patch.enabled) (not .Values.scheduler.certManager.enabled) }}
+{{- if and .Values.scheduler.admissionWebhook.enabled (.Values.scheduler.patch.enabled) (not .Values.scheduler.certManager.enabled) -}}
 apiVersion: batch/v1
 kind: Job
 metadata:
@@ -62,4 +61,3 @@ spec:
         runAsNonRoot: true
         runAsUser: {{ .Values.scheduler.patch.runAsUser }}
 {{- end }}
-{{- end }}
diff --git a/packages/system/hami/charts/hami/templates/scheduler/job-patch/psp.yaml b/packages/system/hami/charts/hami/templates/scheduler/job-patch/psp.yaml
index a48270e7..1e9cd7da 100644
--- a/packages/system/hami/charts/hami/templates/scheduler/job-patch/psp.yaml
+++ b/packages/system/hami/charts/hami/templates/scheduler/job-patch/psp.yaml
@@ -1,5 +1,4 @@
-{{- if and .Values.scheduler.admissionWebhook.enabled (not .Values.dra.enabled) -}}
-{{- if and (.Values.scheduler.patch.enabled) (not .Values.scheduler.certManager.enabled) }}
+{{- if and .Values.scheduler.admissionWebhook.enabled (.Values.scheduler.patch.enabled) (not .Values.scheduler.certManager.enabled) -}}
 {{- if .Values.podSecurityPolicy.enabled }}
 apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
@@ -37,4 +36,3 @@ spec:
   - downwardAPI
 {{- end }}
 {{- end }}
-{{- end }}
diff --git a/packages/system/hami/charts/hami/templates/scheduler/job-patch/role.yaml b/packages/system/hami/charts/hami/templates/scheduler/job-patch/role.yaml
index 74e45681..56682f8e 100644
--- a/packages/system/hami/charts/hami/templates/scheduler/job-patch/role.yaml
+++ b/packages/system/hami/charts/hami/templates/scheduler/job-patch/role.yaml
@@ -1,5 +1,4 @@
-{{- if and .Values.scheduler.admissionWebhook.enabled (not .Values.dra.enabled) -}}
-{{- if and (.Values.scheduler.patch.enabled) (not .Values.scheduler.certManager.enabled) }}
+{{- if and .Values.scheduler.admissionWebhook.enabled (.Values.scheduler.patch.enabled) (not .Values.scheduler.certManager.enabled) -}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
@@ -20,4 +19,3 @@ rules:
       - get
       - create
 {{- end }}
-{{- end }}
diff --git a/packages/system/hami/charts/hami/templates/scheduler/job-patch/rolebinding.yaml b/packages/system/hami/charts/hami/templates/scheduler/job-patch/rolebinding.yaml
index 32da5ba4..7239b128 100644
--- a/packages/system/hami/charts/hami/templates/scheduler/job-patch/rolebinding.yaml
+++ b/packages/system/hami/charts/hami/templates/scheduler/job-patch/rolebinding.yaml
@@ -1,5 +1,4 @@
-{{- if and .Values.scheduler.admissionWebhook.enabled (not .Values.dra.enabled) -}}
-{{- if and (.Values.scheduler.patch.enabled) (not .Values.scheduler.certManager.enabled) }}
+{{- if and .Values.scheduler.admissionWebhook.enabled (.Values.scheduler.patch.enabled) (not .Values.scheduler.certManager.enabled) -}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
@@ -20,4 +19,3 @@ subjects:
     name: {{ include "hami-vgpu.fullname" . }}-admission
     namespace: {{ include "hami-vgpu.namespace" . }}
 {{- end }}
-{{- end }}
diff --git a/packages/system/hami/charts/hami/templates/scheduler/job-patch/serviceaccount.yaml b/packages/system/hami/charts/hami/templates/scheduler/job-patch/serviceaccount.yaml
index d2eb41de..857c6a8d 100644
--- a/packages/system/hami/charts/hami/templates/scheduler/job-patch/serviceaccount.yaml
+++ b/packages/system/hami/charts/hami/templates/scheduler/job-patch/serviceaccount.yaml
@@ -1,5 +1,4 @@
-{{- if and .Values.scheduler.admissionWebhook.enabled (not .Values.dra.enabled) }}
-{{- if and (.Values.scheduler.patch.enabled) (not .Values.scheduler.certManager.enabled) }}
+{{- if and .Values.scheduler.admissionWebhook.enabled (.Values.scheduler.patch.enabled) (not .Values.scheduler.certManager.enabled) }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -12,4 +11,3 @@ metadata:
     {{- include "hami-vgpu.labels" . | nindent 4 }}
     app.kubernetes.io/component: admission-webhook
 {{- end }}
-{{- end }}
diff --git a/packages/system/hami/charts/hami/templates/scheduler/role.yaml b/packages/system/hami/charts/hami/templates/scheduler/role.yaml
index 6e681967..90987a4f 100644
--- a/packages/system/hami/charts/hami/templates/scheduler/role.yaml
+++ b/packages/system/hami/charts/hami/templates/scheduler/role.yaml
@@ -1,4 +1,3 @@
-{{- if not .Values.dra.enabled -}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
@@ -10,5 +9,4 @@ metadata:
 rules:
   - apiGroups: ["coordination.k8s.io"]
     resources: ["leases"]
-    verbs: ["create", "list", "watch", "get", "update", "patch"]
-{{- end }}
\ No newline at end of file
+    verbs: ["create", "list", "watch", "get", "update", "patch"]
\ No newline at end of file
diff --git a/packages/system/hami/charts/hami/templates/scheduler/rolebinding.yaml b/packages/system/hami/charts/hami/templates/scheduler/rolebinding.yaml
index 934f8223..96e175a1 100644
--- a/packages/system/hami/charts/hami/templates/scheduler/rolebinding.yaml
+++ b/packages/system/hami/charts/hami/templates/scheduler/rolebinding.yaml
@@ -1,4 +1,3 @@
-{{- if not .Values.dra.enabled -}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
@@ -30,4 +29,3 @@ subjects:
     name: {{ include "hami-vgpu.mock-device-plugin" . }}
     namespace: {{ include "hami-vgpu.namespace" . }}
 {{- end -}}
-{{- end }}
diff --git a/packages/system/hami/charts/hami/templates/scheduler/service.yaml b/packages/system/hami/charts/hami/templates/scheduler/service.yaml
index 3e18bc98..70378c5c 100644
--- a/packages/system/hami/charts/hami/templates/scheduler/service.yaml
+++ b/packages/system/hami/charts/hami/templates/scheduler/service.yaml
@@ -1,4 +1,3 @@
-{{- if not .Values.dra.enabled }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -32,5 +31,4 @@ spec:
       protocol: TCP
   selector:
     app.kubernetes.io/component: hami-scheduler
-    {{- include "hami-vgpu.selectorLabels" . | nindent 4 }}
-{{- end }}
\ No newline at end of file
+    {{- include "hami-vgpu.selectorLabels" . | nindent 4 }}
\ No newline at end of file
diff --git a/packages/system/hami/charts/hami/templates/scheduler/serviceaccount.yaml b/packages/system/hami/charts/hami/templates/scheduler/serviceaccount.yaml
index 929bf59a..0435c003 100644
--- a/packages/system/hami/charts/hami/templates/scheduler/serviceaccount.yaml
+++ b/packages/system/hami/charts/hami/templates/scheduler/serviceaccount.yaml
@@ -1,4 +1,3 @@
-{{- if not .Values.dra.enabled -}}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -15,4 +14,3 @@ metadata:
   name: {{ include "hami-vgpu.mock-device-plugin" . }}
   namespace: {{ include "hami-vgpu.namespace" . }}
 {{- end -}}
-{{- end }}
diff --git a/packages/system/hami/charts/hami/templates/scheduler/webhook.yaml b/packages/system/hami/charts/hami/templates/scheduler/webhook.yaml
index 148feb5c..7296eb4e 100644
--- a/packages/system/hami/charts/hami/templates/scheduler/webhook.yaml
+++ b/packages/system/hami/charts/hami/templates/scheduler/webhook.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.scheduler.admissionWebhook.enabled (not .Values.dra.enabled) -}}
+{{- if .Values.scheduler.admissionWebhook.enabled -}}
 apiVersion: admissionregistration.k8s.io/v1
 kind: MutatingWebhookConfiguration
 metadata:
diff --git a/packages/system/hami/charts/hami/values.yaml b/packages/system/hami/charts/hami/values.yaml
index 9fbeca70..02feeada 100644
--- a/packages/system/hami/charts/hami/values.yaml
+++ b/packages/system/hami/charts/hami/values.yaml
@@ -392,24 +392,6 @@ mockDevicePlugin:
     ##   - myRegistryKeySecretName
     ##
     pullSecrets: []
-# If this option is enabled, the DRA will be installed and the scheduler extender will not be installed.
-dra:
-  enabled: false
-
-# Configuration for the hami-dra subchart, which includes DRA drivers.
-# This is part of config for DRA, please refer to the DRA documentation for more details.
-hami-dra:
-  monitor:
-    enabled: true
-  drivers:
-    nvidia:
-      enabled: true
-      # If you are using gpu driver on host, you need to set this to false
-      containerDriver: true
-      image:
-        repository: projecthami/k8s-dra-driver
-        tag: "v0.0.1-dev"
-
 devices:
   amd:
     customresources:
diff --git a/packages/system/hami/values.yaml b/packages/system/hami/values.yaml
index 1155e2cb..1d1407b7 100644
--- a/packages/system/hami/values.yaml
+++ b/packages/system/hami/values.yaml
@@ -1,6 +1,10 @@
 hami:
   devicePlugin:
     runtimeClassName: nvidia
+    updateStrategy:
+      type: OnDelete
+    # See upstream charts/hami/values.yaml for nodeConfiguration format.
+    # Each entry: {"name": "node-name", "operatingmode": "hami-core", "devicesplitcount": N, ...}
     nodeConfiguration:
       config: |
         {