diff --git a/kubernetes/apps/kustomization.yaml b/kubernetes/apps/kustomization.yaml
index a83ae19..27892a2 100644
--- a/kubernetes/apps/kustomization.yaml
+++ b/kubernetes/apps/kustomization.yaml
@@ -3,7 +3,6 @@ kind: Kustomization
 resources:
   - ./adguard-home/adguard-home.yaml
   - ./capacitor/capacitor.yaml
-  - ./cert-manager/cert-manager.yaml
   - ./code-server/code-server.yaml
   - ./dokuwiki/dokuwiki.yaml
   - ./gitea/gitea.yaml
@@ -12,7 +11,6 @@ resources:
   - ./kavita/kavita.yaml
   - ./nexus/nexus.yaml
   - ./podinfo/podinfo.yaml
-  - ./postgresql/postgresql.yaml
   - ./qbittorrent/qbittorrent.yaml
   - ./redis/redis.yaml
   - ./snippet-box/snippet-box.yaml
diff --git a/kubernetes/apps/cert-manager/app/release.yaml b/kubernetes/infrastructure/cert-manager/app/release.yaml
similarity index 100%
rename from kubernetes/apps/cert-manager/app/release.yaml
rename to kubernetes/infrastructure/cert-manager/app/release.yaml
diff --git a/kubernetes/apps/cert-manager/app/repository.yaml b/kubernetes/infrastructure/cert-manager/app/repository.yaml
similarity index 100%
rename from kubernetes/apps/cert-manager/app/repository.yaml
rename to kubernetes/infrastructure/cert-manager/app/repository.yaml
diff --git a/kubernetes/apps/cert-manager/cert-manager.yaml b/kubernetes/infrastructure/cert-manager/cert-manager.yaml
similarity index 86%
rename from kubernetes/apps/cert-manager/cert-manager.yaml
rename to kubernetes/infrastructure/cert-manager/cert-manager.yaml
index 63a3bab..fc916f7 100644
--- a/kubernetes/apps/cert-manager/cert-manager.yaml
+++ b/kubernetes/infrastructure/cert-manager/cert-manager.yaml
@@ -8,12 +8,15 @@ spec:
   timeout: 1m30s
   retryInterval: 30s
   targetNamespace: cert-manager
-  path: ./kubernetes/apps/cert-manager/app
+  path: ./kubernetes/infrastructure/cert-manager/app
   prune: true
   sourceRef:
     kind: GitRepository
     namespace: flux-system
     name: flux-system
+  dependsOn:
+    - name: namespaces
+      namespace: flux-system
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
@@ -32,6 +35,8 @@ spec:
     namespace: flux-system
     name: home-cluster-ops-secrets
   dependsOn:
+    - name: namespaces
+      namespace: flux-system
     - name: repositories
       namespace: flux-system
   decryption:
@@ -49,7 +54,7 @@ spec:
   timeout: 1m30s
   retryInterval: 30s
   targetNamespace: cert-manager
-  path: ./kubernetes/apps/cert-manager/clusterissuer
+  path: ./kubernetes/infrastructure/cert-manager/clusterissuer
   prune: true
   sourceRef:
     kind: GitRepository
@@ -82,6 +87,8 @@ spec:
     namespace: flux-system
     name: home-cluster-ops-secrets
   dependsOn:
+    - name: namespaces
+      namespace: flux-system
     - name: repositories
       namespace: flux-system
   decryption:
@@ -99,7 +106,7 @@ spec:
   timeout: 1m30s
   retryInterval: 30s
   targetNamespace: cert-manager
-  path: ./kubernetes/apps/cert-manager/certificates
+  path: ./kubernetes/infrastructure/cert-manager/certificates
   prune: true
   sourceRef:
     kind: GitRepository
diff --git a/kubernetes/apps/cert-manager/certificates/adguard-home.yaml b/kubernetes/infrastructure/cert-manager/certificates/adguard-home.yaml
similarity index 100%
rename from kubernetes/apps/cert-manager/certificates/adguard-home.yaml
rename to kubernetes/infrastructure/cert-manager/certificates/adguard-home.yaml
diff --git a/kubernetes/apps/cert-manager/clusterissuer/clusterissuer-cloudflare.yaml b/kubernetes/infrastructure/cert-manager/clusterissuer/clusterissuer-cloudflare.yaml
similarity index 100%
rename from kubernetes/apps/cert-manager/clusterissuer/clusterissuer-cloudflare.yaml
rename to kubernetes/infrastructure/cert-manager/clusterissuer/clusterissuer-cloudflare.yaml
diff --git a/kubernetes/infrastructure/kustomization.yaml b/kubernetes/infrastructure/kustomization.yaml
index 4119841..8fe7257 100644
--- a/kubernetes/infrastructure/kustomization.yaml
+++ b/kubernetes/infrastructure/kustomization.yaml
@@ -1,9 +1,11 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
+  - ./cert-manager/cert-manager.yaml
   #  - ./cilium/cilium.yaml
   - ./minio/minio.yaml
   - ./ingress-nginx/ingress-nginx.yaml
   - ./ingress-nginx/ingress-nginx-config.yaml
   - ./namespaces/namespaces.yaml
+  - ./postgresql/postgresql.yaml
   - ./repositories/repositories.yaml
\ No newline at end of file
diff --git a/kubernetes/apps/postgresql/app/ingress.yaml b/kubernetes/infrastructure/postgresql/app/ingress.yaml
similarity index 100%
rename from kubernetes/apps/postgresql/app/ingress.yaml
rename to kubernetes/infrastructure/postgresql/app/ingress.yaml
diff --git a/kubernetes/apps/postgresql/app/pvc.yaml b/kubernetes/infrastructure/postgresql/app/pvc.yaml
similarity index 100%
rename from kubernetes/apps/postgresql/app/pvc.yaml
rename to kubernetes/infrastructure/postgresql/app/pvc.yaml
diff --git a/kubernetes/apps/postgresql/app/release.yaml b/kubernetes/infrastructure/postgresql/app/release.yaml
similarity index 100%
rename from kubernetes/apps/postgresql/app/release.yaml
rename to kubernetes/infrastructure/postgresql/app/release.yaml
diff --git a/kubernetes/apps/postgresql/postgresql.yaml b/kubernetes/infrastructure/postgresql/postgresql.yaml
similarity index 89%
rename from kubernetes/apps/postgresql/postgresql.yaml
rename to kubernetes/infrastructure/postgresql/postgresql.yaml
index ac70623..b2e216c 100644
--- a/kubernetes/apps/postgresql/postgresql.yaml
+++ b/kubernetes/infrastructure/postgresql/postgresql.yaml
@@ -15,6 +15,8 @@ spec:
     namespace: flux-system
     name: home-cluster-ops-secrets
   dependsOn:
+    - name: namespaces
+      namespace: flux-system
     - name: repositories
       namespace: flux-system
   decryption:
@@ -31,7 +33,7 @@ spec:
   interval: 10m
   timeout: 1m30s
   retryInterval: 30s
-  path: ./kubernetes/apps/postgresql/app
+  path: ./kubernetes/infrastructure/postgresql/app
   prune: true
   sourceRef:
     kind: GitRepository
diff --git a/kubernetes/apps/postgresql/scripts/ingress-nginx-svc-controller-patch.yaml b/kubernetes/infrastructure/postgresql/scripts/ingress-nginx-svc-controller-patch.yaml
similarity index 100%
rename from kubernetes/apps/postgresql/scripts/ingress-nginx-svc-controller-patch.yaml
rename to kubernetes/infrastructure/postgresql/scripts/ingress-nginx-svc-controller-patch.yaml
diff --git a/kubernetes/apps/postgresql/scripts/patch-ingress-nginx.sh b/kubernetes/infrastructure/postgresql/scripts/patch-ingress-nginx.sh
similarity index 100%
rename from kubernetes/apps/postgresql/scripts/patch-ingress-nginx.sh
rename to kubernetes/infrastructure/postgresql/scripts/patch-ingress-nginx.sh
diff --git a/kubernetes/apps/prometheus-operator/app/release.yaml b/kubernetes/infrastructure/prometheus-operator/app/release.yaml
similarity index 100%
rename from kubernetes/apps/prometheus-operator/app/release.yaml
rename to kubernetes/infrastructure/prometheus-operator/app/release.yaml
diff --git a/kubernetes/apps/prometheus-operator/prometheus-operator.yaml b/kubernetes/infrastructure/prometheus-operator/prometheus-operator.yaml
similarity index 100%
rename from kubernetes/apps/prometheus-operator/prometheus-operator.yaml
rename to kubernetes/infrastructure/prometheus-operator/prometheus-operator.yaml