diff --git a/kubernetes/apps/kube-system/intel-device-plugin/gpu/gpu-rule.yaml b/kubernetes/apps/kube-system/intel-device-plugin/gpu/gpu-rule.yaml
new file mode 100644
index 000000000..12d35ed49
--- /dev/null
+++ b/kubernetes/apps/kube-system/intel-device-plugin/gpu/gpu-rule.yaml
@@ -0,0 +1,15 @@
+---
+apiVersion: nfd.k8s-sigs.io/v1alpha1
+kind: NodeFeatureRule
+metadata:
+  name: intel-gpu-device
+spec:
+  rules:
+    - name: intel.gpu
+      labels:
+        intel.feature.node.kubernetes.io/gpu: "true"
+      matchFeatures:
+        - feature: pci.device
+          matchExpressions:
+            vendor: { op: In, value: ["8086"] }
+            class: { op: In, value: ["0300", "0380"] }
diff --git a/kubernetes/apps/kube-system/intel-device-plugin/gpu/helmrelease.yaml b/kubernetes/apps/kube-system/intel-device-plugin/gpu/helmrelease.yaml
index d52011c1f..5a294f8cb 100644
--- a/kubernetes/apps/kube-system/intel-device-plugin/gpu/helmrelease.yaml
+++ b/kubernetes/apps/kube-system/intel-device-plugin/gpu/helmrelease.yaml
@@ -30,5 +30,5 @@ spec:
       namespace: kube-system
   values:
     name: intel-device-plugin-gpu
-    sharedDevNum: 4
-    nodeFeatureRule: true
+    sharedDevNum: 3
+    nodeFeatureRule: false
diff --git a/kubernetes/apps/kube-system/intel-device-plugin/gpu/kustomization.yaml b/kubernetes/apps/kube-system/intel-device-plugin/gpu/kustomization.yaml
index 1af0c2237..12d1b871b 100644
--- a/kubernetes/apps/kube-system/intel-device-plugin/gpu/kustomization.yaml
+++ b/kubernetes/apps/kube-system/intel-device-plugin/gpu/kustomization.yaml
@@ -4,4 +4,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: kube-system
 resources:
+  - ./gpu-rule.yaml
   - ./helmrelease.yaml
diff --git a/kubernetes/apps/kube-system/node-feature-discovery/app/helmrelease.yaml b/kubernetes/apps/kube-system/node-feature-discovery/app/helmrelease.yaml
index f9d37af0b..e8a7d8f05 100644
--- a/kubernetes/apps/kube-system/node-feature-discovery/app/helmrelease.yaml
+++ b/kubernetes/apps/kube-system/node-feature-discovery/app/helmrelease.yaml
@@ -70,8 +70,3 @@ spec:
                     class: ["02"]
                     vendor: ["2341"]
                     device: ["0042"]
-            - name: "intel-gpu"
-              matchOn:
-                - pciId:
-                    class: ["0300"]
-                    vendor: ["8086"]