diff --git a/kubernetes/apps/capacitor/capacitor.yaml b/kubernetes/apps/capacitor/capacitor.yaml
index 82eb80b..0454c49 100644
--- a/kubernetes/apps/capacitor/capacitor.yaml
+++ b/kubernetes/apps/capacitor/capacitor.yaml
@@ -13,4 +13,7 @@ spec:
   path: "./"
   sourceRef:
     kind: OCIRepository
-    name: capacitor
\ No newline at end of file
+    name: capacitor
+  dependsOn:
+    - name: repositories
+      namespace: flux-system
\ No newline at end of file
diff --git a/kubernetes/apps/capacitor/ocirepository.yaml b/kubernetes/apps/capacitor/ocirepository.yaml
deleted file mode 100644
index b0bd67a..0000000
--- a/kubernetes/apps/capacitor/ocirepository.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-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/apps/cert-manager/cert-manager.yaml b/kubernetes/apps/cert-manager/cert-manager.yaml
index 32eac01..29b3fb9 100644
--- a/kubernetes/apps/cert-manager/cert-manager.yaml
+++ b/kubernetes/apps/cert-manager/cert-manager.yaml
@@ -46,7 +46,8 @@ spec:
     namespace: flux-system
     name: home-cluster-ops
   dependsOn:
-    - name: cert-manager-secrets
+    - name: repositories
+      namespace: flux-system
     - name: cert-manager
   postBuild:
     substituteFrom:
diff --git a/kubernetes/apps/kustomization.yaml b/kubernetes/apps/kustomization.yaml
index 1c8d156..9cd2539 100644
--- a/kubernetes/apps/kustomization.yaml
+++ b/kubernetes/apps/kustomization.yaml
@@ -1,7 +1,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ./capacitor
-  - ./cert-manager
-  - ./cilium
-  - ./podinfo
\ No newline at end of file
+  - ./capacitor/capacitor.yaml
+  - ./cert-manager/cert-manager.yaml
+  - ./cilium/cilium.yaml
+  - ./podinfo/podinfo.yaml
\ No newline at end of file
diff --git a/kubernetes/apps/podinfo/podinfo.yaml b/kubernetes/apps/podinfo/podinfo.yaml
index 3e7646a..24cb3f5 100644
--- a/kubernetes/apps/podinfo/podinfo.yaml
+++ b/kubernetes/apps/podinfo/podinfo.yaml
@@ -4,13 +4,14 @@ metadata:
   name: podinfo
   namespace: podinfo
 spec:
-  interval: 30m0s
-  path: ./kustomize
+  interval: 1h
+  path: ./kubernetes/apps/podinfo
   prune: true
-  retryInterval: 2m0s
   sourceRef:
-    kind: HelmRepository
-    name: podinfo
-  targetNamespace: podinfo
-  timeout: 3m0s
-  wait: true
+    kind: GitRepository
+    namespace: flux-system
+    name: home-cluster-ops
+  dependsOn:
+    - name: repositories
+      namespace: flux-system
+
diff --git a/kubernetes/apps/podinfo/repository.yaml b/kubernetes/apps/podinfo/repository.yaml
deleted file mode 100644
index b3b0730..0000000
--- a/kubernetes/apps/podinfo/repository.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-apiVersion: source.toolkit.fluxcd.io/v1
-kind: HelmRepository
-metadata:
-  name: podinfo
-  namespace: podinfo
-spec:
-  interval: 5m
-  url: https://stefanprodan.github.io/podinfo
\ No newline at end of file
diff --git a/kubernetes/infrastructure/infrasturecture.yaml b/kubernetes/infrastructure/infrasturecture.yaml
deleted file mode 100644
index 7bd7512..0000000
--- a/kubernetes/infrastructure/infrasturecture.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/gitrepository_v1.json
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
-  name: home-cluster-ops-repo
-  namespace: flux-system
-spec:
-  interval: 5m
-  path: ./kubernetes/infrastructure/repositories
-  prune: true
-  sourceRef:
-    kind: GitRepository
-    namespace: flux-system
-    name: home-cluster-ops
\ No newline at end of file
diff --git a/kubernetes/infrastructure/kustomization.yaml b/kubernetes/infrastructure/kustomization.yaml
index 76efe62..cff8667 100644
--- a/kubernetes/infrastructure/kustomization.yaml
+++ b/kubernetes/infrastructure/kustomization.yaml
@@ -1,4 +1,4 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ./infrasturecture.yaml
+  - ./repositories/repositories.yaml
diff --git a/kubernetes/infrastructure/notification-controller/notification-controller.yaml b/kubernetes/infrastructure/notification-controller/notification-controller.yaml
new file mode 100644
index 0000000..8b46c8d
--- /dev/null
+++ b/kubernetes/infrastructure/notification-controller/notification-controller.yaml
@@ -0,0 +1,17 @@
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: notification-controller
+  namespace: flux-system
+spec:
+  targetNamespace: flux-system
+  interval: 1h
+  retryInterval: 2m
+  timeout: 5m
+  wait: true
+  prune: true
+  path: ./kubernetes/infrastructure/notification-controller
+  sourceRef:
+    kind: GitRepository
+    namespace: flux-system
+    name: home-cluster-ops
\ No newline at end of file
diff --git a/kubernetes/infrastructure/repositories/repositories.yaml b/kubernetes/infrastructure/repositories/repositories.yaml
index 87a51fa..a770a37 100644
--- a/kubernetes/infrastructure/repositories/repositories.yaml
+++ b/kubernetes/infrastructure/repositories/repositories.yaml
@@ -12,3 +12,38 @@ spec:
     name: flux-system
   timeout: 60s
   url: https://github.com/3dwardch3ng/home-cluster-ops.git
+---
+apiVersion: source.toolkit.fluxcd.io/v1
+kind: HelmRepository
+metadata:
+  name: podinfo
+  namespace: podinfo
+spec:
+  interval: 5m
+  url: https://stefanprodan.github.io/podinfo
+---
+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"
+---
+# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/gitrepository_v1.json
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: repositories
+  namespace: flux-system
+spec:
+  interval: 5m
+  path: ./kubernetes/infrastructure/repositories
+  prune: true
+  sourceRef:
+    kind: GitRepository
+    namespace: flux-system
+    name: home-cluster-ops