diff --git a/internal/state/testdata/golden/gpucluster-dra-driver-full-spec.yaml b/internal/state/testdata/golden/gpucluster-dra-driver-full-spec.yaml
index f3552d5d2..bdc760981 100644
--- a/internal/state/testdata/golden/gpucluster-dra-driver-full-spec.yaml
+++ b/internal/state/testdata/golden/gpucluster-dra-driver-full-spec.yaml
@@ -343,6 +343,7 @@ kind: DeviceClass
 metadata:
   name: gpu.nvidia.com
 spec:
+  extendedResourceName: nvidia.com/gpu
   selectors:
   - cel:
       expression: device.driver == 'gpu.nvidia.com' && device.attributes['gpu.nvidia.com'].type
diff --git a/internal/state/testdata/golden/gpucluster-dra-driver-gpus-only.yaml b/internal/state/testdata/golden/gpucluster-dra-driver-gpus-only.yaml
index 5f371e7f7..59e436dd6 100644
--- a/internal/state/testdata/golden/gpucluster-dra-driver-gpus-only.yaml
+++ b/internal/state/testdata/golden/gpucluster-dra-driver-gpus-only.yaml
@@ -136,6 +136,7 @@ kind: DeviceClass
 metadata:
   name: gpu.nvidia.com
 spec:
+  extendedResourceName: nvidia.com/gpu
   selectors:
   - cel:
       expression: device.driver == 'gpu.nvidia.com' && device.attributes['gpu.nvidia.com'].type
diff --git a/internal/state/testdata/golden/gpucluster-dra-driver-passthrough-support.yaml b/internal/state/testdata/golden/gpucluster-dra-driver-passthrough-support.yaml
index 99df54e1b..9ef6f2746 100644
--- a/internal/state/testdata/golden/gpucluster-dra-driver-passthrough-support.yaml
+++ b/internal/state/testdata/golden/gpucluster-dra-driver-passthrough-support.yaml
@@ -136,6 +136,7 @@ kind: DeviceClass
 metadata:
   name: gpu.nvidia.com
 spec:
+  extendedResourceName: nvidia.com/gpu
   selectors:
   - cel:
       expression: device.driver == 'gpu.nvidia.com' && device.attributes['gpu.nvidia.com'].type
diff --git a/manifests/state-dra-driver/0400_deviceclass-gpu.yaml b/manifests/state-dra-driver/0400_deviceclass-gpu.yaml
index 3b11494a3..a248c8d42 100644
--- a/manifests/state-dra-driver/0400_deviceclass-gpu.yaml
+++ b/manifests/state-dra-driver/0400_deviceclass-gpu.yaml
@@ -6,3 +6,6 @@ spec:
   selectors:
     - cel:
         expression: "device.driver == 'gpu.nvidia.com' && device.attributes['gpu.nvidia.com'].type == 'gpu'"
+{{- if eq .DeviceClassAPIVersion "resource.k8s.io/v1" }}
+  extendedResourceName: nvidia.com/gpu
+{{- end }}