diff --git a/clusters/titan.lan.huizinga.dev/apps.yaml b/clusters/titan.lan.huizinga.dev/apps.yaml
index 53257ce..c5121c2 100644
--- a/clusters/titan.lan.huizinga.dev/apps.yaml
+++ b/clusters/titan.lan.huizinga.dev/apps.yaml
@@ -9,6 +9,7 @@ spec:
     - name: traefik
     - name: topolvm
     - name: rook-ceph-cluster
+    - name: akri
   decryption:
     provider: sops
     secretRef:
diff --git a/clusters/titan.lan.huizinga.dev/infra/akri.yaml b/clusters/titan.lan.huizinga.dev/infra/akri.yaml
new file mode 100644
index 0000000..342e2d7
--- /dev/null
+++ b/clusters/titan.lan.huizinga.dev/infra/akri.yaml
@@ -0,0 +1,14 @@
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: akri
+  namespace: flux-system
+spec:
+  interval: 15m
+  path: ./infra/akri
+  prune: true
+  timeout: 2m
+  sourceRef:
+    kind: GitRepository
+    name: flux-system
+  wait: true
diff --git a/infrastructure/controllers/akri.yaml b/infra/akri/helm-release.yaml
similarity index 53%
rename from infrastructure/controllers/akri.yaml
rename to infra/akri/helm-release.yaml
index 0be6b8d..fd3c431 100644
--- a/infrastructure/controllers/akri.yaml
+++ b/infra/akri/helm-release.yaml
@@ -1,22 +1,7 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: akri
----
-apiVersion: source.toolkit.fluxcd.io/v1
-kind: HelmRepository
-metadata:
-  name: akri
-  namespace: akri
-spec:
-  interval: 1m0s
-  url: https://project-akri.github.io/akri/
----
 apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: akri
-  namespace: akri
 spec:
   chart:
     spec:
@@ -26,7 +11,8 @@ spec:
         kind: HelmRepository
         name: akri
       version: 0.13.8
-  interval: 1m0s
+  interval: 15m
+  timeout: 5m
   values:
     udev:
       discovery:
diff --git a/infra/akri/helm-repository.yaml b/infra/akri/helm-repository.yaml
new file mode 100644
index 0000000..c6673a0
--- /dev/null
+++ b/infra/akri/helm-repository.yaml
@@ -0,0 +1,8 @@
+apiVersion: source.toolkit.fluxcd.io/v1
+kind: HelmRepository
+metadata:
+  name: akri
+spec:
+  interval: 15m
+  timeout: 2m
+  url: https://project-akri.github.io/akri/
diff --git a/infra/akri/kustomization.yaml b/infra/akri/kustomization.yaml
new file mode 100644
index 0000000..a2ffefd
--- /dev/null
+++ b/infra/akri/kustomization.yaml
@@ -0,0 +1,7 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: akri
+resources:
+  - ./namespace.yaml
+  - ./helm-repository.yaml
+  - ./helm-release.yaml
diff --git a/infra/akri/namespace.yaml b/infra/akri/namespace.yaml
new file mode 100644
index 0000000..32abcbf
--- /dev/null
+++ b/infra/akri/namespace.yaml
@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: akri
diff --git a/infrastructure/controllers/kustomization.yaml b/infrastructure/controllers/kustomization.yaml
index 34a8236..4fb8224 100644
--- a/infrastructure/controllers/kustomization.yaml
+++ b/infrastructure/controllers/kustomization.yaml
@@ -1,7 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - akri.yaml
   - ./node-feature-discovery
   - https://raw.githubusercontent.com/dragonflydb/dragonfly-operator/refs/tags/v1.1.8/manifests/dragonfly-operator.yaml
   - https://github.com/kubernetes-csi/external-snapshotter//client/config/crd?ref=v8.2.0