From 2a0e3d44c6fd15e5c45ee78e7c822f1e5ff98ed9 Mon Sep 17 00:00:00 2001
From: auricom <27022259+auricom@users.noreply.github.com>
Date: Wed, 16 Apr 2025 01:43:20 +0200
Subject: [PATCH] fixup! refactor: components

---
 .../actions-runner-controller/ks.yaml         |  1 +
 .../crunchy-postgres-operator/ks.yaml         |  2 +
 kubernetes/apps/database/dragonfly/ks.yaml    |  1 +
 kubernetes/apps/database/emqx/ks.yaml         |  1 +
 kubernetes/apps/database/influx/ks.yaml       |  1 +
 kubernetes/apps/default/authelia/ks.yaml      |  1 +
 kubernetes/apps/default/bazarr/ks.yaml        |  1 +
 kubernetes/apps/default/calibre/ks.yaml       |  1 +
 kubernetes/apps/default/flood/ks.yaml         |  1 +
 kubernetes/apps/default/freshrss/ks.yaml      |  1 +
 kubernetes/apps/default/frigate/ks.yaml       |  1 +
 kubernetes/apps/default/ghostfolio/ks.yaml    |  1 +
 .../apps/default/home-assistant/ks.yaml       |  1 +
 kubernetes/apps/default/jellyfin/ks.yaml      |  1 +
 kubernetes/apps/default/jellyseerr/ks.yaml    |  1 +
 kubernetes/apps/default/joplin/ks.yaml        |  1 +
 kubernetes/apps/default/komf/ks.yaml          |  1 +
 kubernetes/apps/default/komga/ks.yaml         |  1 +
 kubernetes/apps/default/libmedium/ks.yaml     |  1 +
 kubernetes/apps/default/lidarr/ks.yaml        |  1 +
 kubernetes/apps/default/linkding/ks.yaml      |  1 +
 kubernetes/apps/default/lychee/ks.yaml        |  1 +
 kubernetes/apps/default/navidrome/ks.yaml     |  1 +
 kubernetes/apps/default/outline/ks.yaml       |  1 +
 kubernetes/apps/default/paperless/ks.yaml     |  1 +
 kubernetes/apps/default/prowlarr/ks.yaml      |  1 +
 kubernetes/apps/default/radarr/ks.yaml        |  1 +
 kubernetes/apps/default/sabnzbd/ks.yaml       |  1 +
 kubernetes/apps/default/smtp-relay/ks.yaml    |  1 +
 kubernetes/apps/default/sonarr/ks.yaml        |  1 +
 kubernetes/apps/default/tandoor/ks.yaml       |  1 +
 kubernetes/apps/default/vaultwarden/ks.yaml   |  1 +
 kubernetes/apps/default/vikunja/ks.yaml       |  1 +
 .../external-secrets/app/helmrelease.yaml     |  7 +---
 .../external-secrets/external-secrets/ks.yaml | 38 ++++---------------
 kubernetes/apps/network/cloudflared/ks.yaml   |  1 +
 kubernetes/apps/network/external-dns/ks.yaml  |  1 +
 kubernetes/apps/observability/gatus/ks.yaml   |  1 +
 .../apps/observability/scrutiny/ks.yaml       |  1 +
 39 files changed, 46 insertions(+), 37 deletions(-)

diff --git a/kubernetes/apps/actions-runner-system/actions-runner-controller/ks.yaml b/kubernetes/apps/actions-runner-system/actions-runner-controller/ks.yaml
index 845488979..906ed97f3 100644
--- a/kubernetes/apps/actions-runner-system/actions-runner-controller/ks.yaml
+++ b/kubernetes/apps/actions-runner-system/actions-runner-controller/ks.yaml
@@ -12,6 +12,7 @@ spec:
       app.kubernetes.io/name: *app
   dependsOn:
     - name: external-secrets-stores
+      namespace: external-secrets
   path: ./kubernetes/apps/actions-runner-system/actions-runner-controller/app
   prune: true
   sourceRef:
diff --git a/kubernetes/apps/database/crunchy-postgres-operator/ks.yaml b/kubernetes/apps/database/crunchy-postgres-operator/ks.yaml
index be86943fd..ef856d6e1 100644
--- a/kubernetes/apps/database/crunchy-postgres-operator/ks.yaml
+++ b/kubernetes/apps/database/crunchy-postgres-operator/ks.yaml
@@ -41,6 +41,7 @@ spec:
   dependsOn:
     - name: crunchy-postgres-operator
     - name: external-secrets-stores
+      namespace: external-secrets
 ---
 # yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/kustomize.toolkit.fluxcd.io/kustomization_v1.json
 apiVersion: kustomize.toolkit.fluxcd.io/v1
@@ -64,6 +65,7 @@ spec:
   dependsOn:
     - name: crunchy-postgres-operator-cluster
     - name: external-secrets
+      namespace: external-secrets
 ---
 # yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/kustomize.toolkit.fluxcd.io/kustomization_v1.json
 apiVersion: kustomize.toolkit.fluxcd.io/v1
diff --git a/kubernetes/apps/database/dragonfly/ks.yaml b/kubernetes/apps/database/dragonfly/ks.yaml
index 2a7cb30a5..d8ebac2f2 100644
--- a/kubernetes/apps/database/dragonfly/ks.yaml
+++ b/kubernetes/apps/database/dragonfly/ks.yaml
@@ -12,6 +12,7 @@ spec:
       app.kubernetes.io/name: *app
   dependsOn:
     - name: external-secrets-stores
+      namespace: external-secrets
   path: ./kubernetes/apps/database/dragonfly/app
   prune: true
   sourceRef:
diff --git a/kubernetes/apps/database/emqx/ks.yaml b/kubernetes/apps/database/emqx/ks.yaml
index a611eea6b..46cadefe8 100644
--- a/kubernetes/apps/database/emqx/ks.yaml
+++ b/kubernetes/apps/database/emqx/ks.yaml
@@ -13,6 +13,7 @@ spec:
   dependsOn:
     - name: rook-ceph-cluster
     - name: external-secrets-stores
+      namespace: external-secrets
   path: ./kubernetes/apps/database/emqx/app
   prune: true
   sourceRef:
diff --git a/kubernetes/apps/database/influx/ks.yaml b/kubernetes/apps/database/influx/ks.yaml
index 575776776..faab3dc11 100644
--- a/kubernetes/apps/database/influx/ks.yaml
+++ b/kubernetes/apps/database/influx/ks.yaml
@@ -17,6 +17,7 @@ spec:
     name: home-ops-kubernetes
   dependsOn:
     - name: external-secrets-stores
+      namespace: external-secrets
     - name: volsync
   wait: true
   interval: 30m
diff --git a/kubernetes/apps/default/authelia/ks.yaml b/kubernetes/apps/default/authelia/ks.yaml
index 6aba9f95e..e2164dd8d 100644
--- a/kubernetes/apps/default/authelia/ks.yaml
+++ b/kubernetes/apps/default/authelia/ks.yaml
@@ -14,6 +14,7 @@ spec:
     - name: crunchy-postgres-operator-cluster
     - name: dragonfly-cluster
     - name: external-secrets-stores
+      namespace: external-secrets
   path: ./kubernetes/apps/default/authelia/app
   prune: true
   sourceRef:
diff --git a/kubernetes/apps/default/bazarr/ks.yaml b/kubernetes/apps/default/bazarr/ks.yaml
index 0f3d85afb..4aad6e616 100644
--- a/kubernetes/apps/default/bazarr/ks.yaml
+++ b/kubernetes/apps/default/bazarr/ks.yaml
@@ -13,6 +13,7 @@ spec:
   dependsOn:
     - name: crunchy-postgres-operator-cluster
     - name: external-secrets-stores
+      namespace: external-secrets
     - name: rook-ceph-cluster
     - name: volsync
   path: ./kubernetes/apps/default/bazarr/app
diff --git a/kubernetes/apps/default/calibre/ks.yaml b/kubernetes/apps/default/calibre/ks.yaml
index 736befe63..205e733d7 100644
--- a/kubernetes/apps/default/calibre/ks.yaml
+++ b/kubernetes/apps/default/calibre/ks.yaml
@@ -12,6 +12,7 @@ spec:
       app.kubernetes.io/name: *app
   dependsOn:
     - name: external-secrets-stores
+      namespace: external-secrets
     - name: rook-ceph-cluster
     - name: volsync
   path: ./kubernetes/apps/default/calibre/app
diff --git a/kubernetes/apps/default/flood/ks.yaml b/kubernetes/apps/default/flood/ks.yaml
index 5dba5c38f..8e2e26d8e 100644
--- a/kubernetes/apps/default/flood/ks.yaml
+++ b/kubernetes/apps/default/flood/ks.yaml
@@ -12,6 +12,7 @@ spec:
       app.kubernetes.io/name: *app
   dependsOn:
     - name: external-secrets-stores
+      namespace: external-secrets
     - name: qbittorrent
     - name: volsync
   path: ./kubernetes/apps/default/flood/app
diff --git a/kubernetes/apps/default/freshrss/ks.yaml b/kubernetes/apps/default/freshrss/ks.yaml
index 8496e9836..b26cee199 100644
--- a/kubernetes/apps/default/freshrss/ks.yaml
+++ b/kubernetes/apps/default/freshrss/ks.yaml
@@ -17,6 +17,7 @@ spec:
     name: home-ops-kubernetes
   dependsOn:
     - name: external-secrets-stores
+      namespace: external-secrets
     - name: volsync
   wait: false
   interval: 30m
diff --git a/kubernetes/apps/default/frigate/ks.yaml b/kubernetes/apps/default/frigate/ks.yaml
index 40cc2f7b9..587161b38 100644
--- a/kubernetes/apps/default/frigate/ks.yaml
+++ b/kubernetes/apps/default/frigate/ks.yaml
@@ -12,6 +12,7 @@ spec:
       app.kubernetes.io/name: *app
   dependsOn:
     - name: external-secrets-stores
+      namespace: external-secrets
     - name: node-feature-discovery-rules
   path: ./kubernetes/apps/default/frigate/app
   prune: true
diff --git a/kubernetes/apps/default/ghostfolio/ks.yaml b/kubernetes/apps/default/ghostfolio/ks.yaml
index f56947bf8..30ed5b913 100644
--- a/kubernetes/apps/default/ghostfolio/ks.yaml
+++ b/kubernetes/apps/default/ghostfolio/ks.yaml
@@ -18,6 +18,7 @@ spec:
   dependsOn:
     - name: crunchy-postgres-operator-cluster
     - name: external-secrets-stores
+      namespace: external-secrets
     - name: dragonfly-cluster
   wait: false
   interval: 30m
diff --git a/kubernetes/apps/default/home-assistant/ks.yaml b/kubernetes/apps/default/home-assistant/ks.yaml
index 3694b282b..097ddc348 100644
--- a/kubernetes/apps/default/home-assistant/ks.yaml
+++ b/kubernetes/apps/default/home-assistant/ks.yaml
@@ -13,6 +13,7 @@ spec:
   dependsOn:
     - name: crunchy-postgres-operator-cluster
     - name: external-secrets-stores
+      namespace: external-secrets
     - name: volsync
   path: ./kubernetes/apps/default/home-assistant/app
   prune: true
diff --git a/kubernetes/apps/default/jellyfin/ks.yaml b/kubernetes/apps/default/jellyfin/ks.yaml
index 54e020ddd..a9540505f 100644
--- a/kubernetes/apps/default/jellyfin/ks.yaml
+++ b/kubernetes/apps/default/jellyfin/ks.yaml
@@ -13,6 +13,7 @@ spec:
   dependsOn:
     - name: rook-ceph-cluster
     - name: external-secrets-stores
+      namespace: external-secrets
     - name: volsync
   path: ./kubernetes/apps/default/jellyfin/app
   prune: true
diff --git a/kubernetes/apps/default/jellyseerr/ks.yaml b/kubernetes/apps/default/jellyseerr/ks.yaml
index 865c817eb..fdef7b83a 100644
--- a/kubernetes/apps/default/jellyseerr/ks.yaml
+++ b/kubernetes/apps/default/jellyseerr/ks.yaml
@@ -13,6 +13,7 @@ spec:
   dependsOn:
     - name: rook-ceph-cluster
     - name: external-secrets-stores
+      namespace: external-secrets
     - name: volsync
   path: ./kubernetes/apps/default/jellyseerr/app
   prune: true
diff --git a/kubernetes/apps/default/joplin/ks.yaml b/kubernetes/apps/default/joplin/ks.yaml
index 25a0fa42d..49ab7dccf 100644
--- a/kubernetes/apps/default/joplin/ks.yaml
+++ b/kubernetes/apps/default/joplin/ks.yaml
@@ -18,6 +18,7 @@ spec:
   dependsOn:
     - name: crunchy-postgres-operator-cluster
     - name: external-secrets-stores
+      namespace: external-secrets
   wait: false
   interval: 30m
   retryInterval: 1m
diff --git a/kubernetes/apps/default/komf/ks.yaml b/kubernetes/apps/default/komf/ks.yaml
index 21e2b8c0e..9efb722e4 100644
--- a/kubernetes/apps/default/komf/ks.yaml
+++ b/kubernetes/apps/default/komf/ks.yaml
@@ -12,6 +12,7 @@ spec:
       app.kubernetes.io/name: *app
   dependsOn:
     - name: external-secrets-stores
+      namespace: external-secrets
     - name: rook-ceph-cluster
     - name: volsync
   path: ./kubernetes/apps/default/komf/app
diff --git a/kubernetes/apps/default/komga/ks.yaml b/kubernetes/apps/default/komga/ks.yaml
index 63402b6da..b93ec27c9 100644
--- a/kubernetes/apps/default/komga/ks.yaml
+++ b/kubernetes/apps/default/komga/ks.yaml
@@ -12,6 +12,7 @@ spec:
       app.kubernetes.io/name: *app
   dependsOn:
     - name: external-secrets-stores
+      namespace: external-secrets
     - name: rook-ceph-cluster
     - name: volsync
   path: ./kubernetes/apps/default/komga/app
diff --git a/kubernetes/apps/default/libmedium/ks.yaml b/kubernetes/apps/default/libmedium/ks.yaml
index d377af90f..d5e940763 100644
--- a/kubernetes/apps/default/libmedium/ks.yaml
+++ b/kubernetes/apps/default/libmedium/ks.yaml
@@ -14,6 +14,7 @@ spec:
   path: ./kubernetes/apps/default/libmedium/app
   dependsOn:
     - name: external-secrets-stores
+      namespace: external-secrets
   prune: true
   sourceRef:
     kind: GitRepository
diff --git a/kubernetes/apps/default/lidarr/ks.yaml b/kubernetes/apps/default/lidarr/ks.yaml
index 42b35f2fa..581e703f9 100644
--- a/kubernetes/apps/default/lidarr/ks.yaml
+++ b/kubernetes/apps/default/lidarr/ks.yaml
@@ -14,6 +14,7 @@ spec:
   dependsOn:
     - name: crunchy-postgres-operator-cluster
     - name: external-secrets-stores
+      namespace: external-secrets
     - name: rook-ceph-cluster
     - name: volsync
   path: ./kubernetes/apps/default/lidarr/app
diff --git a/kubernetes/apps/default/linkding/ks.yaml b/kubernetes/apps/default/linkding/ks.yaml
index 17a8d7a83..e6f164905 100644
--- a/kubernetes/apps/default/linkding/ks.yaml
+++ b/kubernetes/apps/default/linkding/ks.yaml
@@ -17,6 +17,7 @@ spec:
     name: home-ops-kubernetes
   dependsOn:
     - name: external-secrets-stores
+      namespace: external-secrets
   wait: false
   interval: 30m
   retryInterval: 1m
diff --git a/kubernetes/apps/default/lychee/ks.yaml b/kubernetes/apps/default/lychee/ks.yaml
index 9d60efdd3..f4c0d590e 100644
--- a/kubernetes/apps/default/lychee/ks.yaml
+++ b/kubernetes/apps/default/lychee/ks.yaml
@@ -19,6 +19,7 @@ spec:
     - name: crunchy-postgres-operator-cluster
     - name: dragonfly-cluster
     - name: external-secrets-stores
+      namespace: external-secrets
     - name: rook-ceph-cluster
     - name: volsync
   wait: false
diff --git a/kubernetes/apps/default/navidrome/ks.yaml b/kubernetes/apps/default/navidrome/ks.yaml
index a7b7307cd..e304acdb5 100644
--- a/kubernetes/apps/default/navidrome/ks.yaml
+++ b/kubernetes/apps/default/navidrome/ks.yaml
@@ -12,6 +12,7 @@ spec:
       app.kubernetes.io/name: *app
   dependsOn:
     - name: external-secrets-stores
+      namespace: external-secrets
     - name: rook-ceph-cluster
     - name: volsync
   path: ./kubernetes/apps/default/navidrome/app
diff --git a/kubernetes/apps/default/outline/ks.yaml b/kubernetes/apps/default/outline/ks.yaml
index 495b4af19..c0ec21774 100644
--- a/kubernetes/apps/default/outline/ks.yaml
+++ b/kubernetes/apps/default/outline/ks.yaml
@@ -19,6 +19,7 @@ spec:
     - name: crunchy-postgres-operator-cluster
     - name: dragonfly-cluster
     - name: external-secrets-stores
+      namespace: external-secrets
   wait: false
   interval: 30m
   retryInterval: 1m
diff --git a/kubernetes/apps/default/paperless/ks.yaml b/kubernetes/apps/default/paperless/ks.yaml
index f117e9864..699f5e487 100644
--- a/kubernetes/apps/default/paperless/ks.yaml
+++ b/kubernetes/apps/default/paperless/ks.yaml
@@ -19,6 +19,7 @@ spec:
     - name: crunchy-postgres-operator-cluster
     - name: dragonfly-cluster
     - name: external-secrets-stores
+      namespace: external-secrets
   wait: false
   interval: 30m
   retryInterval: 1m
diff --git a/kubernetes/apps/default/prowlarr/ks.yaml b/kubernetes/apps/default/prowlarr/ks.yaml
index 0e423b692..b99f89d53 100644
--- a/kubernetes/apps/default/prowlarr/ks.yaml
+++ b/kubernetes/apps/default/prowlarr/ks.yaml
@@ -13,6 +13,7 @@ spec:
   dependsOn:
     - name: crunchy-postgres-operator-cluster
     - name: external-secrets-stores
+      namespace: external-secrets
   path: ./kubernetes/apps/default/prowlarr/app
   prune: true
   sourceRef:
diff --git a/kubernetes/apps/default/radarr/ks.yaml b/kubernetes/apps/default/radarr/ks.yaml
index d556d7a4f..201924752 100644
--- a/kubernetes/apps/default/radarr/ks.yaml
+++ b/kubernetes/apps/default/radarr/ks.yaml
@@ -13,6 +13,7 @@ spec:
   dependsOn:
     - name: crunchy-postgres-operator-cluster
     - name: external-secrets-stores
+      namespace: external-secrets
     - name: rook-ceph-cluster
     - name: volsync
   path: ./kubernetes/apps/default/radarr/app
diff --git a/kubernetes/apps/default/sabnzbd/ks.yaml b/kubernetes/apps/default/sabnzbd/ks.yaml
index 1aaeb2c86..22e426aca 100644
--- a/kubernetes/apps/default/sabnzbd/ks.yaml
+++ b/kubernetes/apps/default/sabnzbd/ks.yaml
@@ -12,6 +12,7 @@ spec:
       app.kubernetes.io/name: *app
   dependsOn:
     - name: external-secrets-stores
+      namespace: external-secrets
     - name: rook-ceph-cluster
     - name: volsync
   path: ./kubernetes/apps/default/sabnzbd/app
diff --git a/kubernetes/apps/default/smtp-relay/ks.yaml b/kubernetes/apps/default/smtp-relay/ks.yaml
index a25dc8c32..9ee38bba3 100644
--- a/kubernetes/apps/default/smtp-relay/ks.yaml
+++ b/kubernetes/apps/default/smtp-relay/ks.yaml
@@ -14,6 +14,7 @@ spec:
   prune: true
   dependsOn:
     - name: external-secrets-stores
+      namespace: external-secrets
   sourceRef:
     kind: GitRepository
     name: home-ops-kubernetes
diff --git a/kubernetes/apps/default/sonarr/ks.yaml b/kubernetes/apps/default/sonarr/ks.yaml
index 92358eba7..006ef4ebd 100644
--- a/kubernetes/apps/default/sonarr/ks.yaml
+++ b/kubernetes/apps/default/sonarr/ks.yaml
@@ -13,6 +13,7 @@ spec:
   dependsOn:
     - name: crunchy-postgres-operator-cluster
     - name: external-secrets-stores
+      namespace: external-secrets
     - name: rook-ceph-cluster
     - name: volsync
   path: ./kubernetes/apps/default/sonarr/app
diff --git a/kubernetes/apps/default/tandoor/ks.yaml b/kubernetes/apps/default/tandoor/ks.yaml
index 4eefa4dda..a2875903a 100644
--- a/kubernetes/apps/default/tandoor/ks.yaml
+++ b/kubernetes/apps/default/tandoor/ks.yaml
@@ -18,6 +18,7 @@ spec:
   dependsOn:
     - name: crunchy-postgres-operator-cluster
     - name: external-secrets-stores
+      namespace: external-secrets
     - name: rook-ceph-cluster
     - name: volsync
   wait: false
diff --git a/kubernetes/apps/default/vaultwarden/ks.yaml b/kubernetes/apps/default/vaultwarden/ks.yaml
index 2ed16e3df..db697dfbc 100644
--- a/kubernetes/apps/default/vaultwarden/ks.yaml
+++ b/kubernetes/apps/default/vaultwarden/ks.yaml
@@ -18,6 +18,7 @@ spec:
   dependsOn:
     - name: crunchy-postgres-operator-cluster
     - name: external-secrets-stores
+      namespace: external-secrets
     - name: rook-ceph-cluster
     - name: volsync
   wait: false
diff --git a/kubernetes/apps/default/vikunja/ks.yaml b/kubernetes/apps/default/vikunja/ks.yaml
index b68575656..30826af02 100644
--- a/kubernetes/apps/default/vikunja/ks.yaml
+++ b/kubernetes/apps/default/vikunja/ks.yaml
@@ -18,6 +18,7 @@ spec:
   dependsOn:
     - name: crunchy-postgres-operator-cluster
     - name: external-secrets-stores
+      namespace: external-secrets
     - name: rook-ceph-cluster
     - name: volsync
   wait: false
diff --git a/kubernetes/apps/external-secrets/external-secrets/app/helmrelease.yaml b/kubernetes/apps/external-secrets/external-secrets/app/helmrelease.yaml
index 6d8f35725..a2c699425 100644
--- a/kubernetes/apps/external-secrets/external-secrets/app/helmrelease.yaml
+++ b/kubernetes/apps/external-secrets/external-secrets/app/helmrelease.yaml
@@ -10,13 +10,8 @@ spec:
     mediaType: application/vnd.cncf.helm.chart.content.v1.tar+gzip
     operation: copy
   ref:
-    tag: 0.16.0@sha256:73d56ac13a838ae4d6025e0f5e021dca4e48f833b5b0aa1e2f81a51d5e33f6d1
+    tag: 0.16.0
   url: oci://ghcr.io/external-secrets/charts/external-secrets
-  verify:
-    provider: cosign
-    matchOIDCIdentity:
-      - issuer: ^https://token.actions.githubusercontent.com$
-        subject: ^https://github.com/external-secrets/external-secrets.*$
 ---
 # yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/helm.toolkit.fluxcd.io/helmrelease_v2.json
 apiVersion: helm.toolkit.fluxcd.io/v2
diff --git a/kubernetes/apps/external-secrets/external-secrets/ks.yaml b/kubernetes/apps/external-secrets/external-secrets/ks.yaml
index aef540ca5..db60d8ef9 100644
--- a/kubernetes/apps/external-secrets/external-secrets/ks.yaml
+++ b/kubernetes/apps/external-secrets/external-secrets/ks.yaml
@@ -4,7 +4,7 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: &app external-secrets
-  namespace: &namespace flux-system
+  namespace: &namespace external-secrets
 spec:
   commonMetadata:
     labels:
@@ -13,7 +13,7 @@ spec:
     - apiVersion: helm.toolkit.fluxcd.io/v2
       kind: HelmRelease
       name: *app
-      namespace: external-secrets
+      namespace: *namespace
   interval: 1h
   path: ./kubernetes/apps/external-secrets/external-secrets/app
   prune: true
@@ -21,28 +21,16 @@ spec:
   sourceRef:
     kind: GitRepository
     name: home-ops-kubernetes
-    namespace: *namespace
-  targetNamespace: external-secrets
+    namespace: flux-system
+  targetNamespace: *namespace
   timeout: 15m
-  decryption:
-    provider: sops
-    secretRef:
-      name: sops-age
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
 ---
 # yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/kustomize.toolkit.fluxcd.io/kustomization_v1.json
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: &app external-secrets-stores
-  namespace: &namespace flux-system
+  namespace: &namespace external-secrets
 spec:
   commonMetadata:
     labels:
@@ -59,18 +47,6 @@ spec:
   sourceRef:
     kind: GitRepository
     name: home-ops-kubernetes
-    namespace: *namespace
-  targetNamespace: external-secrets
+    namespace: flux-system
+  targetNamespace: *namespace
   timeout: 15m
-  decryption:
-    provider: sops
-    secretRef:
-      name: sops-age
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
diff --git a/kubernetes/apps/network/cloudflared/ks.yaml b/kubernetes/apps/network/cloudflared/ks.yaml
index b4169c804..405708b8d 100644
--- a/kubernetes/apps/network/cloudflared/ks.yaml
+++ b/kubernetes/apps/network/cloudflared/ks.yaml
@@ -13,6 +13,7 @@ spec:
   dependsOn:
     - name: external-dns-cloudflare
     - name: external-secrets-stores
+      namespace: external-secrets
   path: ./kubernetes/apps/network/cloudflared/app
   prune: false
   sourceRef:
diff --git a/kubernetes/apps/network/external-dns/ks.yaml b/kubernetes/apps/network/external-dns/ks.yaml
index 79980a196..54c0c6bee 100644
--- a/kubernetes/apps/network/external-dns/ks.yaml
+++ b/kubernetes/apps/network/external-dns/ks.yaml
@@ -17,6 +17,7 @@ spec:
     name: home-ops-kubernetes
   dependsOn:
     - name: external-secrets-stores
+      namespace: external-secrets
   wait: false
   interval: 30m
   retryInterval: 1m
diff --git a/kubernetes/apps/observability/gatus/ks.yaml b/kubernetes/apps/observability/gatus/ks.yaml
index 6a4d96963..6ed18cb16 100644
--- a/kubernetes/apps/observability/gatus/ks.yaml
+++ b/kubernetes/apps/observability/gatus/ks.yaml
@@ -12,6 +12,7 @@ spec:
       app.kubernetes.io/name: *app
   dependsOn:
     - name: external-secrets-stores
+      namespace: external-secrets
   path: ./kubernetes/apps/observability/gatus/app
   prune: true
   sourceRef:
diff --git a/kubernetes/apps/observability/scrutiny/ks.yaml b/kubernetes/apps/observability/scrutiny/ks.yaml
index 730ac17a2..fc908f260 100644
--- a/kubernetes/apps/observability/scrutiny/ks.yaml
+++ b/kubernetes/apps/observability/scrutiny/ks.yaml
@@ -12,6 +12,7 @@ spec:
       app.kubernetes.io/name: *app
   dependsOn:
     - name: external-secrets-stores
+      namespace: external-secrets
     - name: rook-ceph-cluster
     - name: volsync
   path: ./kubernetes/apps/observability/scrutiny/app