diff --git a/code-server/manifests/secret.yaml b/code-server/manifests/secret.yaml
index 7d00cec..a43448f 100644
--- a/code-server/manifests/secret.yaml
+++ b/code-server/manifests/secret.yaml
@@ -14,5 +14,5 @@ spec:
   data:
     - secretKey: password
       remoteRef:
-        key: code-server
+        key: applications/code-server
         property: PASSWORD
diff --git a/headlamp/manifests/external-secret.yaml b/headlamp/manifests/external-secret.yaml
index dd4caa5..8b8d70a 100644
--- a/headlamp/manifests/external-secret.yaml
+++ b/headlamp/manifests/external-secret.yaml
@@ -23,5 +23,5 @@ spec:
   data:
     - secretKey: clientSecret
       remoteRef:
-        key: authelia
+        key: security/authelia
         property: HEADLAMP_CLIENT_SECRET
diff --git a/mas/manifests/external-secret.yaml b/mas/manifests/external-secret.yaml
index a5ba6cf..a89779c 100644
--- a/mas/manifests/external-secret.yaml
+++ b/mas/manifests/external-secret.yaml
@@ -13,7 +13,7 @@ spec:
   data:
   - secretKey: anthropic-api-key
     remoteRef:
-      key: mas
+      key: applications/mas
       property: ANTHROPIC_API_KEY
 ---
 apiVersion: external-secrets.io/v1
@@ -31,5 +31,5 @@ spec:
   data:
   - secretKey: password
     remoteRef:
-      key: postgresql
+      key: storage/postgresql
       property: PASSWORD
diff --git a/umami/manifests/secret.yaml b/umami/manifests/secret.yaml
index ea57be0..c914a78 100644
--- a/umami/manifests/secret.yaml
+++ b/umami/manifests/secret.yaml
@@ -14,9 +14,9 @@ spec:
   data:
     - secretKey: database-url
       remoteRef:
-        key: umami
+        key: applications/umami
         property: DATABASE_URL
     - secretKey: hash-salt
       remoteRef:
-        key: umami
+        key: applications/umami
         property: HASH_SALT