diff --git a/kubernetes/apps/cert-manager/cert-manager.yaml b/kubernetes/apps/cert-manager/cert-manager.yaml
index 591ffe1..43fe743 100644
--- a/kubernetes/apps/cert-manager/cert-manager.yaml
+++ b/kubernetes/apps/cert-manager/cert-manager.yaml
@@ -19,7 +19,7 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: clusterissuer-secrets
-  namespace: cert-manager
+  namespace: flux-system
 spec:
   interval: 10m
   timeout: 1m30s
@@ -37,7 +37,7 @@ spec:
   decryption:
     provider: sops
     secretRef:
-      name: cert-manager-sops-age
+      name: sops-age
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
diff --git a/kubernetes/apps/code-server/code-server.yaml b/kubernetes/apps/code-server/code-server.yaml
index 4c9bbc4..983683f 100644
--- a/kubernetes/apps/code-server/code-server.yaml
+++ b/kubernetes/apps/code-server/code-server.yaml
@@ -2,7 +2,7 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: code-server-secrets
-  namespace: code-server
+  namespace: flux-system
 spec:
   interval: 10m
   timeout: 1m30s
@@ -20,7 +20,7 @@ spec:
   decryption:
     provider: sops
     secretRef:
-      name: code-server-sops-age
+      name: sops-age
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
diff --git a/kubernetes/apps/dokuwiki/dokuwiki.yaml b/kubernetes/apps/dokuwiki/dokuwiki.yaml
index 86503ba..2f287b3 100644
--- a/kubernetes/apps/dokuwiki/dokuwiki.yaml
+++ b/kubernetes/apps/dokuwiki/dokuwiki.yaml
@@ -2,7 +2,7 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: dokuwiki-secrets
-  namespace: dokuwiki
+  namespace: flux-system
 spec:
   interval: 10m
   timeout: 1m30s
@@ -20,7 +20,7 @@ spec:
   decryption:
     provider: sops
     secretRef:
-      name: dokuwiki-sops-age
+      name: sops-age
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
diff --git a/kubernetes/apps/gitea/gitea.yaml b/kubernetes/apps/gitea/gitea.yaml
index ce1797f..2c63957 100644
--- a/kubernetes/apps/gitea/gitea.yaml
+++ b/kubernetes/apps/gitea/gitea.yaml
@@ -2,7 +2,7 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: gitea-secrets
-  namespace: gitea
+  namespace: flux-system
 spec:
   interval: 10m
   timeout: 1m30s
@@ -20,7 +20,7 @@ spec:
   decryption:
     provider: sops
     secretRef:
-      name: gitea-sops-age
+      name: sops-age
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
diff --git a/kubernetes/apps/postgresql/postgresql.yaml b/kubernetes/apps/postgresql/postgresql.yaml
index cd5a749..a19211c 100644
--- a/kubernetes/apps/postgresql/postgresql.yaml
+++ b/kubernetes/apps/postgresql/postgresql.yaml
@@ -2,7 +2,7 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: postgresql-secrets
-  namespace: postgresql
+  namespace: flux-system
 spec:
   interval: 10m
   timeout: 1m30s
@@ -20,7 +20,7 @@ spec:
   decryption:
     provider: sops
     secretRef:
-      name: postgresql-sops-age
+      name: sops-age
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
diff --git a/kubernetes/apps/redis/redis.yaml b/kubernetes/apps/redis/redis.yaml
index 9504156..73523c4 100644
--- a/kubernetes/apps/redis/redis.yaml
+++ b/kubernetes/apps/redis/redis.yaml
@@ -2,7 +2,7 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: redis-secrets
-  namespace: redis
+  namespace: flux-system
 spec:
   interval: 10m
   timeout: 1m30s
@@ -20,7 +20,7 @@ spec:
   decryption:
     provider: sops
     secretRef:
-      name: redis-sops-age
+      name: sops-age
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
diff --git a/kubernetes/apps/sonarqube/sonarqube.yaml b/kubernetes/apps/sonarqube/sonarqube.yaml
index 0fd057c..94daa13 100644
--- a/kubernetes/apps/sonarqube/sonarqube.yaml
+++ b/kubernetes/apps/sonarqube/sonarqube.yaml
@@ -2,7 +2,7 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: sonarqube-secrets
-  namespace: sonarqube
+  namespace: flux-system
 spec:
   interval: 10m
   timeout: 1m30s
@@ -20,7 +20,7 @@ spec:
   decryption:
     provider: sops
     secretRef:
-      name: sonarqube-sops-age
+      name: sops-age
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization