diff --git a/clusters/titan.lan.huizinga.dev/infra/intel-device-plugins.yaml b/clusters/titan.lan.huizinga.dev/infra/intel-device-plugins.yaml
new file mode 100644
index 0000000..0d79175
--- /dev/null
+++ b/clusters/titan.lan.huizinga.dev/infra/intel-device-plugins.yaml
@@ -0,0 +1,48 @@
+apiVersion: source.toolkit.fluxcd.io/v1
+kind: GitRepository
+metadata:
+  name: intel-device-plugins
+  namespace: flux-system
+spec:
+  interval: 15m0s
+  ref:
+    tag: v0.32.0
+  url: https://github.com/intel/intel-device-plugins-for-kubernetes
+---
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: intel-node-feature-rules
+  namespace: flux-system
+spec:
+  interval: 15m
+  path: ./deployments/nfd/overlays/node-feature-rules
+  dependsOn:
+    - name: node-feature-discovery
+  prune: true
+  timeout: 2m
+  sourceRef:
+    kind: GitRepository
+    name: intel-device-plugins
+  wait: true
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: intel-device-plugins
+---
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: intel-gpu-plugin
+  namespace: flux-system
+spec:
+  interval: 15m
+  path: ./deployments/gpu_plugin/overlays/nfd_labeled_nodes
+  targetNamespace: intel-device-plugins
+  prune: true
+  timeout: 2m
+  sourceRef:
+    kind: GitRepository
+    name: intel-device-plugins
+  wait: true
diff --git a/clusters/titan.lan.huizinga.dev/infra/node-feature-discovery.yaml b/clusters/titan.lan.huizinga.dev/infra/node-feature-discovery.yaml
new file mode 100644
index 0000000..7a0a483
--- /dev/null
+++ b/clusters/titan.lan.huizinga.dev/infra/node-feature-discovery.yaml
@@ -0,0 +1,14 @@
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: node-feature-discovery
+  namespace: flux-system
+spec:
+  interval: 15m
+  path: ./infra/node-feature-discovery
+  prune: true
+  timeout: 2m
+  sourceRef:
+    kind: GitRepository
+    name: flux-system
+  wait: true
diff --git a/infrastructure/controllers/node-feature-discovery/kustomization.yaml b/infra/node-feature-discovery/kustomization.yaml
similarity index 60%
rename from infrastructure/controllers/node-feature-discovery/kustomization.yaml
rename to infra/node-feature-discovery/kustomization.yaml
index 769111f..bb137b6 100644
--- a/infrastructure/controllers/node-feature-discovery/kustomization.yaml
+++ b/infra/node-feature-discovery/kustomization.yaml
@@ -1,8 +1,8 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - https://github.com/kubernetes-sigs/node-feature-discovery/deployment/overlays/default?ref=v0.16.5
-  - https://github.com/intel/intel-device-plugins-for-kubernetes/deployments/nfd/overlays/node-feature-rules?ref=v0.31.0
+  - https://github.com/kubernetes-sigs/node-feature-discovery/deployment/overlays/default?ref=v0.17.1
+
 configMapGenerator:
   - name: nfd-worker-conf
     behavior: replace
diff --git a/infrastructure/controllers/node-feature-discovery/nfd-worker.conf b/infra/node-feature-discovery/nfd-worker.conf
similarity index 100%
rename from infrastructure/controllers/node-feature-discovery/nfd-worker.conf
rename to infra/node-feature-discovery/nfd-worker.conf
diff --git a/infrastructure/configs/intel-devices/gpu-device-plugin.yaml b/infrastructure/configs/intel-devices/gpu-device-plugin.yaml
deleted file mode 100644
index 6a8d6c0..0000000
--- a/infrastructure/configs/intel-devices/gpu-device-plugin.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-apiVersion: deviceplugin.intel.com/v1
-kind: GpuDevicePlugin
-metadata:
-  name: gpudeviceplugin-sample
-spec:
-  image: intel/intel-gpu-plugin:0.31.0
-  sharedDevNum: 10
-  logLevel: 4
-  enableMonitoring: true
-  nodeSelector:
-    intel.feature.node.kubernetes.io/gpu: "true"
diff --git a/infrastructure/configs/intel-devices/kustomization.yaml b/infrastructure/configs/intel-devices/kustomization.yaml
deleted file mode 100644
index 7c62e01..0000000
--- a/infrastructure/configs/intel-devices/kustomization.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-  - https://github.com/intel/intel-device-plugins-for-kubernetes/deployments/operator/device/gpu?ref=v0.31.0
-  - gpu-device-plugin.yaml
diff --git a/infrastructure/configs/kustomization.yaml b/infrastructure/configs/kustomization.yaml
index 52e911f..b83b23e 100644
--- a/infrastructure/configs/kustomization.yaml
+++ b/infrastructure/configs/kustomization.yaml
@@ -1,4 +1,3 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-resources:
-  - ./intel-devices
+resources: []
diff --git a/infrastructure/controllers/kustomization.yaml b/infrastructure/controllers/kustomization.yaml
index b1664a8..b83b23e 100644
--- a/infrastructure/controllers/kustomization.yaml
+++ b/infrastructure/controllers/kustomization.yaml
@@ -1,4 +1,3 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-resources:
-  - ./node-feature-discovery
+resources: []