diff --git a/kubernetes/apps/system/node-feature-discovery/app/helmrelease.yaml b/kubernetes/apps/kube-system/node-feature-discovery/app/helmrelease.yaml
similarity index 96%
rename from kubernetes/apps/system/node-feature-discovery/app/helmrelease.yaml
rename to kubernetes/apps/kube-system/node-feature-discovery/app/helmrelease.yaml
index 75d84189..e0b21ebd 100644
--- a/kubernetes/apps/system/node-feature-discovery/app/helmrelease.yaml
+++ b/kubernetes/apps/kube-system/node-feature-discovery/app/helmrelease.yaml
@@ -4,6 +4,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
   name: node-feature-discovery
+  namespace: kube-system
 spec:
   interval: 30m
   chart:
diff --git a/kubernetes/apps/system/node-feature-discovery/app/kustomization.yaml b/kubernetes/apps/kube-system/node-feature-discovery/app/kustomization.yaml
similarity index 100%
rename from kubernetes/apps/system/node-feature-discovery/app/kustomization.yaml
rename to kubernetes/apps/kube-system/node-feature-discovery/app/kustomization.yaml
diff --git a/kubernetes/apps/system/node-feature-discovery/ks.yaml b/kubernetes/apps/kube-system/node-feature-discovery/ks.yaml
similarity index 87%
rename from kubernetes/apps/system/node-feature-discovery/ks.yaml
rename to kubernetes/apps/kube-system/node-feature-discovery/ks.yaml
index 32aa294a..b784b2f5 100644
--- a/kubernetes/apps/system/node-feature-discovery/ks.yaml
+++ b/kubernetes/apps/kube-system/node-feature-discovery/ks.yaml
@@ -11,7 +11,7 @@ spec:
     labels:
       app.kubernetes.io/name: *appname
   interval: 10m
-  path: "./kubernetes/apps/system/node-feature-discovery/app"
+  path: "./kubernetes/apps/kube-system/node-feature-discovery/app"
   prune: true
   sourceRef:
     kind: GitRepository
@@ -28,7 +28,7 @@ metadata:
     substitution.flux.home.arpa/enabled: "true"
 spec:
   interval: 10m
-  path: "./kubernetes/apps/system/node-feature-discovery/rules"
+  path: "./kubernetes/apps/kube-system/node-feature-discovery/rules"
   prune: true
   sourceRef:
     kind: GitRepository
diff --git a/kubernetes/apps/system/node-feature-discovery/rules/nvidia.yaml b/kubernetes/apps/kube-system/node-feature-discovery/rules/nvidia.yaml
similarity index 77%
rename from kubernetes/apps/system/node-feature-discovery/rules/nvidia.yaml
rename to kubernetes/apps/kube-system/node-feature-discovery/rules/nvidia.yaml
index 34fe935e..354e5f5d 100644
--- a/kubernetes/apps/system/node-feature-discovery/rules/nvidia.yaml
+++ b/kubernetes/apps/kube-system/node-feature-discovery/rules/nvidia.yaml
@@ -1,3 +1,4 @@
+# yaml-language-server: $schema=https://ks.hsn.dev/nfd.k8s-sigs.io/nodefeaturerule_v1alpha1.json
 ---
 apiVersion: nfd.k8s-sigs.io/v1alpha1
 kind: NodeFeatureRule
diff --git a/kubernetes/apps/system/reloader/app/helmrelease.yaml b/kubernetes/apps/kube-system/reloader/app/helmrelease.yaml
similarity index 96%
rename from kubernetes/apps/system/reloader/app/helmrelease.yaml
rename to kubernetes/apps/kube-system/reloader/app/helmrelease.yaml
index c037fff8..40748c2e 100644
--- a/kubernetes/apps/system/reloader/app/helmrelease.yaml
+++ b/kubernetes/apps/kube-system/reloader/app/helmrelease.yaml
@@ -4,7 +4,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
   name: reloader
-  namespace: system
+  namespace: kube-system
 spec:
   interval: 30m
   chart:
diff --git a/kubernetes/apps/system/reloader/app/kustomization.yaml b/kubernetes/apps/kube-system/reloader/app/kustomization.yaml
similarity index 100%
rename from kubernetes/apps/system/reloader/app/kustomization.yaml
rename to kubernetes/apps/kube-system/reloader/app/kustomization.yaml
diff --git a/kubernetes/apps/system/reloader/ks.yaml b/kubernetes/apps/kube-system/reloader/ks.yaml
similarity index 88%
rename from kubernetes/apps/system/reloader/ks.yaml
rename to kubernetes/apps/kube-system/reloader/ks.yaml
index 3c83cdc9..20fcb2c7 100644
--- a/kubernetes/apps/system/reloader/ks.yaml
+++ b/kubernetes/apps/kube-system/reloader/ks.yaml
@@ -9,7 +9,7 @@ metadata:
     substitution.flux.home.arpa/enabled: "true"
 spec:
   interval: 10m
-  path: "./kubernetes/apps/system/reloader/app"
+  path: "./kubernetes/apps/kube-system/reloader/app"
   prune: true
   sourceRef:
     kind: GitRepository
diff --git a/kubernetes/apps/system/kustomization.yaml b/kubernetes/apps/system/kustomization.yaml
deleted file mode 100644
index 90776ced..00000000
--- a/kubernetes/apps/system/kustomization.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-# yaml-language-server: $schema=https://json.schemastore.org/kustomization.json
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-  # Pre Flux-Kustomizations
-  - ./namespace.yaml
-  # Flux-Kustomizations
-  - ./node-feature-discovery/ks.yaml
-  - ./reloader/ks.yaml
diff --git a/kubernetes/apps/system/namespace.yaml b/kubernetes/apps/system/namespace.yaml
deleted file mode 100644
index 210c268e..00000000
--- a/kubernetes/apps/system/namespace.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: system
-  labels:
-    goldilocks.fairwinds.com/enabled: "true"