diff --git a/kubernetes/apps/adguard-home/adguard-home.yaml b/kubernetes/apps/adguard-home/adguard-home.yaml
index 05fc4b0..7d1a350 100644
--- a/kubernetes/apps/adguard-home/adguard-home.yaml
+++ b/kubernetes/apps/adguard-home/adguard-home.yaml
@@ -6,7 +6,7 @@ metadata:
 spec:
   interval: 1h
   targetNamespace: flux-system
-  path: ./kubernetes/apps/adguard-home
+  path: ./kubernetes/apps/adguard-home/app
   prune: true
   sourceRef:
     kind: GitRepository
diff --git a/kubernetes/apps/adguard-home/namespace.yaml b/kubernetes/apps/adguard-home/app/namespace.yaml
similarity index 100%
rename from kubernetes/apps/adguard-home/namespace.yaml
rename to kubernetes/apps/adguard-home/app/namespace.yaml
diff --git a/kubernetes/apps/adguard-home/release.yaml b/kubernetes/apps/adguard-home/app/release.yaml
similarity index 100%
rename from kubernetes/apps/adguard-home/release.yaml
rename to kubernetes/apps/adguard-home/app/release.yaml
diff --git a/kubernetes/apps/cert-manager/release.yaml b/kubernetes/apps/cert-manager/app/release.yaml
similarity index 100%
rename from kubernetes/apps/cert-manager/release.yaml
rename to kubernetes/apps/cert-manager/app/release.yaml
diff --git a/kubernetes/apps/cert-manager/cert-manager.yaml b/kubernetes/apps/cert-manager/cert-manager.yaml
index 6f28893..35f0141 100644
--- a/kubernetes/apps/cert-manager/cert-manager.yaml
+++ b/kubernetes/apps/cert-manager/cert-manager.yaml
@@ -6,7 +6,7 @@ metadata:
 spec:
   interval: 1h
   targetNamespace: flux-system
-  path: ./kubernetes/apps/cert-manager
+  path: ./kubernetes/apps/cert-manager/app
   prune: true
   sourceRef:
     kind: GitRepository
diff --git a/kubernetes/apps/clusterissuer/release.yaml b/kubernetes/apps/clusterissuer/app/release.yaml
similarity index 100%
rename from kubernetes/apps/clusterissuer/release.yaml
rename to kubernetes/apps/clusterissuer/app/release.yaml
diff --git a/kubernetes/apps/clusterissuer/clusterissuer.yaml b/kubernetes/apps/clusterissuer/clusterissuer.yaml
index 5483c11..613a728 100644
--- a/kubernetes/apps/clusterissuer/clusterissuer.yaml
+++ b/kubernetes/apps/clusterissuer/clusterissuer.yaml
@@ -30,7 +30,7 @@ spec:
   suspend: false
   interval: 1h
   targetNamespace: cert-manager
-  path: ./kubernetes/apps/clusterissuer
+  path: ./kubernetes/apps/clusterissuer/app
   prune: true
   sourceRef:
     kind: GitRepository
diff --git a/kubernetes/apps/clusterissuer/secret.yaml b/kubernetes/apps/clusterissuer/secret.yaml
deleted file mode 100644
index dc23af4..0000000
--- a/kubernetes/apps/clusterissuer/secret.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
-  name: clusterissuer-secrets
-  namespace: flux-system
-spec:
-  suspend: true
-  interval: 1d
-  path: ./clusterissuer
-  prune: true
-  sourceRef:
-    kind: GitRepository
-    namespace: flux-system
-    name: home-cluster-ops-secrets
-  dependsOn:
-    - name: repositories
-      namespace: flux-system
-  decryption:
-    provider: sops
-    secretRef:
-      name: sops-age
\ No newline at end of file
diff --git a/kubernetes/apps/podinfo/namespace.yaml b/kubernetes/apps/podinfo/app/namespace.yaml
similarity index 100%
rename from kubernetes/apps/podinfo/namespace.yaml
rename to kubernetes/apps/podinfo/app/namespace.yaml
diff --git a/kubernetes/apps/podinfo/release.yaml b/kubernetes/apps/podinfo/app/release.yaml
similarity index 100%
rename from kubernetes/apps/podinfo/release.yaml
rename to kubernetes/apps/podinfo/app/release.yaml
diff --git a/kubernetes/apps/podinfo/repository.yaml b/kubernetes/apps/podinfo/app/repository.yaml
similarity index 100%
rename from kubernetes/apps/podinfo/repository.yaml
rename to kubernetes/apps/podinfo/app/repository.yaml
diff --git a/kubernetes/apps/podinfo/podinfo.yaml b/kubernetes/apps/podinfo/podinfo.yaml
index 1101aa5..1e2b333 100644
--- a/kubernetes/apps/podinfo/podinfo.yaml
+++ b/kubernetes/apps/podinfo/podinfo.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: flux-system
 spec:
   interval: 1h
-  path: ./kubernetes/apps/podinfo
+  path: ./kubernetes/apps/podinfo/app
   prune: true
   sourceRef:
     kind: GitRepository
diff --git a/kubernetes/apps/prometheus-operator/release.yaml b/kubernetes/apps/prometheus-operator/app/release.yaml
similarity index 100%
rename from kubernetes/apps/prometheus-operator/release.yaml
rename to kubernetes/apps/prometheus-operator/app/release.yaml
diff --git a/kubernetes/apps/prometheus-operator/prometheus-operator.yaml b/kubernetes/apps/prometheus-operator/prometheus-operator.yaml
index 26437ce..330aa66 100644
--- a/kubernetes/apps/prometheus-operator/prometheus-operator.yaml
+++ b/kubernetes/apps/prometheus-operator/prometheus-operator.yaml
@@ -7,7 +7,7 @@ spec:
   suspend: true
   interval: 1h
   targetNamespace: flux-system
-  path: ./kubernetes/apps/prometheus-operator
+  path: ./kubernetes/apps/prometheus-operator/app
   prune: true
   sourceRef:
     kind: GitRepository