diff --git a/.kcignore b/.kcignore
index f0992e5..64a6fb6 100644
--- a/.kcignore
+++ b/.kcignore
@@ -1,2 +1,3 @@
 .sops.yaml
 infra/authelia/values.yaml
+infra/node-feature-discovery/values.yaml
diff --git a/infra/node-feature-discovery/helm-release.yaml b/infra/node-feature-discovery/helm-release.yaml
new file mode 100644
index 0000000..a28b7ff
--- /dev/null
+++ b/infra/node-feature-discovery/helm-release.yaml
@@ -0,0 +1,18 @@
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: node-feature-discovery
+spec:
+  chart:
+    spec:
+      chart: node-feature-discovery
+      reconcileStrategy: ChartVersion
+      sourceRef:
+        kind: HelmRepository
+        name: node-feature-discovery
+      version: 0.17.1
+  interval: 15m
+  timeout: 5m
+  valuesFrom:
+    - kind: ConfigMap
+      name: nfd-values
diff --git a/infra/node-feature-discovery/helm-repository.yaml b/infra/node-feature-discovery/helm-repository.yaml
new file mode 100644
index 0000000..eb85b9a
--- /dev/null
+++ b/infra/node-feature-discovery/helm-repository.yaml
@@ -0,0 +1,8 @@
+apiVersion: source.toolkit.fluxcd.io/v1
+kind: HelmRepository
+metadata:
+  name: node-feature-discovery
+spec:
+  interval: 15m
+  timeout: 2m
+  url: https://kubernetes-sigs.github.io/node-feature-discovery/charts
diff --git a/infra/node-feature-discovery/kustomization.yaml b/infra/node-feature-discovery/kustomization.yaml
index bb137b6..98f6018 100644
--- a/infra/node-feature-discovery/kustomization.yaml
+++ b/infra/node-feature-discovery/kustomization.yaml
@@ -1,10 +1,15 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
+namespace: node-feature-discovery
 resources:
-  - https://github.com/kubernetes-sigs/node-feature-discovery/deployment/overlays/default?ref=v0.17.1
+  - ./namespace.yaml
+  - ./helm-repository.yaml
+  - ./helm-release.yaml
+
+configurations:
+  - ../../common/name-reference/helm-release.yaml
 
 configMapGenerator:
-  - name: nfd-worker-conf
-    behavior: replace
+  - name: nfd-values
     files:
-      - nfd-worker.conf
+      - ./values.yaml
diff --git a/infra/node-feature-discovery/namespace.yaml b/infra/node-feature-discovery/namespace.yaml
new file mode 100644
index 0000000..8e54de2
--- /dev/null
+++ b/infra/node-feature-discovery/namespace.yaml
@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: node-feature-discovery
diff --git a/infra/node-feature-discovery/nfd-worker.conf b/infra/node-feature-discovery/nfd-worker.conf
deleted file mode 100644
index 0245f59..0000000
--- a/infra/node-feature-discovery/nfd-worker.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-core:
-  labelSources:
-   - "local"
diff --git a/infra/node-feature-discovery/values.yaml b/infra/node-feature-discovery/values.yaml
new file mode 100644
index 0000000..705a4f3
--- /dev/null
+++ b/infra/node-feature-discovery/values.yaml
@@ -0,0 +1,5 @@
+worker:
+  config:
+    core:
+      labelSources:
+        - "local"