diff --git a/kubernetes/rpi5-cluster/apps/capacitor/capacitor.yaml b/kubernetes/rpi5-cluster/apps/capacitor/capacitor.yaml
new file mode 100644
index 0000000..82eb80b
--- /dev/null
+++ b/kubernetes/rpi5-cluster/apps/capacitor/capacitor.yaml
@@ -0,0 +1,16 @@
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: capacitor
+  namespace: flux-system
+spec:
+  targetNamespace: flux-system
+  interval: 1h
+  retryInterval: 2m
+  timeout: 5m
+  wait: true
+  prune: true
+  path: "./"
+  sourceRef:
+    kind: OCIRepository
+    name: capacitor
\ No newline at end of file
diff --git a/kubernetes/rpi5-cluster/apps/capacitor/kustomization.yaml b/kubernetes/rpi5-cluster/apps/capacitor/kustomization.yaml
new file mode 100644
index 0000000..c0a1a18
--- /dev/null
+++ b/kubernetes/rpi5-cluster/apps/capacitor/kustomization.yaml
@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - capacitor.yaml
\ No newline at end of file
diff --git a/kubernetes/rpi5-cluster/apps/cert-manager/ks.yaml b/kubernetes/rpi5-cluster/apps/cert-manager/cert-manager.yaml
similarity index 100%
rename from kubernetes/rpi5-cluster/apps/cert-manager/ks.yaml
rename to kubernetes/rpi5-cluster/apps/cert-manager/cert-manager.yaml
diff --git a/kubernetes/rpi5-cluster/apps/cert-manager/kustomization.yaml b/kubernetes/rpi5-cluster/apps/cert-manager/kustomization.yaml
index d194337..859702d 100644
--- a/kubernetes/rpi5-cluster/apps/cert-manager/kustomization.yaml
+++ b/kubernetes/rpi5-cluster/apps/cert-manager/kustomization.yaml
@@ -1,4 +1,4 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ks.yaml
+  - cert-manager.yaml
diff --git a/kubernetes/rpi5-cluster/apps/cilium/ks.yaml b/kubernetes/rpi5-cluster/apps/cilium/cilium.yaml
similarity index 100%
rename from kubernetes/rpi5-cluster/apps/cilium/ks.yaml
rename to kubernetes/rpi5-cluster/apps/cilium/cilium.yaml
diff --git a/kubernetes/rpi5-cluster/apps/cilium/kustomization.yaml b/kubernetes/rpi5-cluster/apps/cilium/kustomization.yaml
index d194337..ebeeb65 100644
--- a/kubernetes/rpi5-cluster/apps/cilium/kustomization.yaml
+++ b/kubernetes/rpi5-cluster/apps/cilium/kustomization.yaml
@@ -1,4 +1,4 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ks.yaml
+  - cilium.yaml
diff --git a/kubernetes/rpi5-cluster/apps/podinfo/kustomization.yaml b/kubernetes/rpi5-cluster/apps/podinfo/kustomization.yaml
new file mode 100644
index 0000000..678ef11
--- /dev/null
+++ b/kubernetes/rpi5-cluster/apps/podinfo/kustomization.yaml
@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - podinfo.yaml
\ No newline at end of file
diff --git a/kubernetes/rpi5-cluster/apps/podinfo/podinfo-kustomization.yaml b/kubernetes/rpi5-cluster/apps/podinfo/podinfo.yaml
similarity index 98%
rename from kubernetes/rpi5-cluster/apps/podinfo/podinfo-kustomization.yaml
rename to kubernetes/rpi5-cluster/apps/podinfo/podinfo.yaml
index 07e30d6..7d077a7 100644
--- a/kubernetes/rpi5-cluster/apps/podinfo/podinfo-kustomization.yaml
+++ b/kubernetes/rpi5-cluster/apps/podinfo/podinfo.yaml
@@ -1,4 +1,3 @@
----
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
diff --git a/kubernetes/rpi5-cluster/infrastructure/kustomization.yaml b/kubernetes/rpi5-cluster/infrastructure/kustomization.yaml
index 54e5811..157797e 100644
--- a/kubernetes/rpi5-cluster/infrastructure/kustomization.yaml
+++ b/kubernetes/rpi5-cluster/infrastructure/kustomization.yaml
@@ -1,5 +1,5 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - repositories/ks.yaml
-  - secrets/ks.yaml
+  - repositories/repositories.yaml
+  - secrets/secrets.yaml
diff --git a/kubernetes/rpi5-cluster/infrastructure/repositories/capacitor.yaml b/kubernetes/rpi5-cluster/infrastructure/repositories/capacitor.yaml
new file mode 100644
index 0000000..b0bd67a
--- /dev/null
+++ b/kubernetes/rpi5-cluster/infrastructure/repositories/capacitor.yaml
@@ -0,0 +1,10 @@
+apiVersion: source.toolkit.fluxcd.io/v1beta2
+kind: OCIRepository
+metadata:
+  name: capacitor
+  namespace: flux-system
+spec:
+  interval: 12h
+  url: oci://ghcr.io/gimlet-io/capacitor-manifests
+  ref:
+    semver: ">=0.1.0"
\ No newline at end of file
diff --git a/kubernetes/rpi5-cluster/apps/podinfo/podinfo-source.yaml b/kubernetes/rpi5-cluster/infrastructure/repositories/podinfo.yaml
similarity index 100%
rename from kubernetes/rpi5-cluster/apps/podinfo/podinfo-source.yaml
rename to kubernetes/rpi5-cluster/infrastructure/repositories/podinfo.yaml
diff --git a/kubernetes/rpi5-cluster/infrastructure/repositories/ks.yaml b/kubernetes/rpi5-cluster/infrastructure/repositories/repositories.yaml
similarity index 100%
rename from kubernetes/rpi5-cluster/infrastructure/repositories/ks.yaml
rename to kubernetes/rpi5-cluster/infrastructure/repositories/repositories.yaml
diff --git a/kubernetes/rpi5-cluster/infrastructure/secrets/ks.yaml b/kubernetes/rpi5-cluster/infrastructure/secrets/secrets.yaml
similarity index 100%
rename from kubernetes/rpi5-cluster/infrastructure/secrets/ks.yaml
rename to kubernetes/rpi5-cluster/infrastructure/secrets/secrets.yaml