diff --git a/alertmanager/manifests/secret.yaml b/alertmanager/manifests/secret.yaml
index 42b0ebf..f198296 100644
--- a/alertmanager/manifests/secret.yaml
+++ b/alertmanager/manifests/secret.yaml
@@ -14,7 +14,7 @@ spec:
   data:
     - secretKey: smtp_auth_password
       remoteRef:
-        key: alertmanager
+        key: observability/alertmanager
         property: SMTP_PASSWORD
 ---
 apiVersion: external-secrets.io/v1
@@ -81,5 +81,5 @@ spec:
   data:
     - secretKey: smtp_password
       remoteRef:
-        key: alertmanager
+        key: observability/alertmanager
         property: SMTP_PASSWORD
diff --git a/grafana/manifests/secret.yaml b/grafana/manifests/secret.yaml
index 87bfd06..81b84bb 100644
--- a/grafana/manifests/secret.yaml
+++ b/grafana/manifests/secret.yaml
@@ -14,5 +14,5 @@ spec:
   data:
     - secretKey: password
       remoteRef:
-        key: postgresql
+        key: storage/postgresql
         property: PASSWORD
diff --git a/prometheus/manifests/secret.yaml b/prometheus/manifests/secret.yaml
index 9734655..c3f51dd 100644
--- a/prometheus/manifests/secret.yaml
+++ b/prometheus/manifests/secret.yaml
@@ -14,7 +14,7 @@ spec:
   data:
     - secretKey: password
       remoteRef:
-        key: postgresql
+        key: storage/postgresql
         property: PASSWORD
 ---
 apiVersion: external-secrets.io/v1
@@ -43,14 +43,14 @@ spec:
   data:
     - secretKey: access_key
       remoteRef:
-        key: minio
+        key: storage/minio
         property: ROOT_USER
         conversionStrategy: Default
         decodingStrategy: None
         metadataPolicy: None
     - secretKey: secret_key
       remoteRef:
-        key: minio
+        key: storage/minio
         property: ROOT_PASSWORD
         conversionStrategy: Default
         decodingStrategy: None
diff --git a/thanos/manifests/secret.yaml b/thanos/manifests/secret.yaml
index ab418bd..97546f4 100644
--- a/thanos/manifests/secret.yaml
+++ b/thanos/manifests/secret.yaml
@@ -24,9 +24,9 @@ spec:
   data:
     - secretKey: access_key
       remoteRef:
-        key: minio
+        key: storage/minio
         property: ROOT_USER
     - secretKey: secret_key
       remoteRef:
-        key: minio
+        key: storage/minio
         property: ROOT_PASSWORD