diff --git a/cluster/core/kube-system/node-feature-discovery/helm-release.yaml b/cluster/core/kube-system/node-feature-discovery/helm-release.yaml
index f7ded8d4b..b2bec6295 100644
--- a/cluster/core/kube-system/node-feature-discovery/helm-release.yaml
+++ b/cluster/core/kube-system/node-feature-discovery/helm-release.yaml
@@ -17,12 +17,12 @@ spec:
         namespace: flux-system
       interval: 5m
   install:
-    crds: CreateReplace
-  upgrade:
-    crds: CreateReplace
+    createNamespace: true
+    remediation:
+      retries: 5
   values:
     nodeFeatureRule:
-      createCRD: true
+      createCRD: false
     master:
       tolerations:
         - key: "node-role.kubernetes.io/control-plane"