diff --git a/ansible/roles_ocp_workloads/ocp4_workload_nvidia_gpu_setup/files/nodefeature_discovery_cr.yaml b/ansible/roles_ocp_workloads/ocp4_workload_nvidia_gpu_setup/files/nodefeature_discovery_cr.yaml
index 9aeafc0fca7..d9cfc19b617 100644
--- a/ansible/roles_ocp_workloads/ocp4_workload_nvidia_gpu_setup/files/nodefeature_discovery_cr.yaml
+++ b/ansible/roles_ocp_workloads/ocp4_workload_nvidia_gpu_setup/files/nodefeature_discovery_cr.yaml
@@ -1,12 +1,21 @@
-apiVersion: nfd.openshift.io/v1
 kind: NodeFeatureDiscovery
+apiVersion: nfd.openshift.io/v1
 metadata:
   name: nfd-instance
   namespace: openshift-nfd
 spec:
+  customConfig:
+    configData: |
+      #    - name: "more.kernel.features"
+      #      matchOn:
+      #      - loadedKMod: ["example_kmod3"]
+      #    - name: "more.features.by.nodename"
+      #      value: customValue
+      #      matchOn:
+      #      - nodename: ["special-.*-node-.*"]
   operand:
-    image: 'registry.redhat.io/openshift4/ose-node-feature-discovery@sha256:5ea4ac45cd9e904a6abaf3be160e86962baaf8c4329e213a2454e42e785feb28'
-    imagePullPolicy: Always
+    image: 'registry.redhat.io/openshift4/ose-node-feature-discovery-rhel9@sha256:b0f786e21798c27905c6fdf189bd91cae1f5ddd58ad101a28dbb8b5de92069ce'
+    imagePullPolicy: IfNotPresent
     servicePort: 12000
   workerConfig:
     configData: |
@@ -116,12 +125,3 @@ spec:
       #            vendor: ["15b3"]
       #            device: ["1014", "1017"]
       #          loadedKMod : ["vendor_kmod1", "vendor_kmod2"]
-  customConfig:
-    configData: |
-      #    - name: "more.kernel.features"
-      #      matchOn:
-      #      - loadedKMod: ["example_kmod3"]
-      #    - name: "more.features.by.nodename"
-      #      value: customValue
-      #      matchOn:
-      #      - nodename: ["special-.*-node-.*"]