diff --git a/minio/manifests/secret.yaml b/minio/manifests/secret.yaml
index 90f90bc..5761054 100644
--- a/minio/manifests/secret.yaml
+++ b/minio/manifests/secret.yaml
@@ -14,19 +14,19 @@ spec:
   data:
     - secretKey: root-user
       remoteRef:
-        key: minio
+        key: storage/minio
         property: ROOT_USER
     - secretKey: root-password
       remoteRef:
-        key: minio
+        key: storage/minio
         property: ROOT_PASSWORD
     - secretKey: rootUser
       remoteRef:
-        key: minio
+        key: storage/minio
         property: ROOT_USER
     - secretKey: rootPassword
       remoteRef:
-        key: minio
+        key: storage/minio
         property: ROOT_PASSWORD
 ---
 apiVersion: external-secrets.io/v1
@@ -49,28 +49,28 @@ spec:
     data:
       - secretKey: AWS_ACCESS_KEY_ID
         remoteRef:
-          key: minio-s3-credentials
+          key: storage/minio-s3-credentials
           property: AWS_ACCESS_KEY_ID
           conversionStrategy: Default
           decodingStrategy: None
           metadataPolicy: None
       - secretKey: AWS_SECRET_ACCESS_KEY
         remoteRef:
-          key: minio-s3-credentials
+          key: storage/minio-s3-credentials
           property: AWS_SECRET_ACCESS_KEY
           conversionStrategy: Default
           decodingStrategy: None
           metadataPolicy: None
       - secretKey: AWS_REGION
         remoteRef:
-          key: minio-s3-credentials
+          key: storage/minio-s3-credentials
           property: AWS_REGION
           conversionStrategy: Default
           decodingStrategy: None
           metadataPolicy: None
       - secretKey: AWS_S3_ENDPOINT
         remoteRef:
-          key: minio-s3-credentials
+          key: storage/minio-s3-credentials
           property: AWS_S3_ENDPOINT
           conversionStrategy: Default
           decodingStrategy: None
diff --git a/pgweb/manifests/secret.yaml b/pgweb/manifests/secret.yaml
index 4e77e3a..9c3d0c8 100644
--- a/pgweb/manifests/secret.yaml
+++ b/pgweb/manifests/secret.yaml
@@ -14,13 +14,13 @@ spec:
   data:
     - secretKey: database-url
       remoteRef:
-        key: pgweb
+        key: storage/pgweb
         property: DATABASE_URL
     - secretKey: auth-user
       remoteRef:
-        key: pgweb
+        key: storage/pgweb
         property: AUTH_USER
     - secretKey: auth-password
       remoteRef:
-        key: pgweb
+        key: storage/pgweb
         property: AUTH_PASSWORD
diff --git a/postgresql/manifests/secret.yaml b/postgresql/manifests/secret.yaml
index fa5479f..ca08c3d 100644
--- a/postgresql/manifests/secret.yaml
+++ b/postgresql/manifests/secret.yaml
@@ -19,7 +19,7 @@ spec:
   data:
     - secretKey: password
       remoteRef:
-        key: postgresql
+        key: storage/postgresql
         property: PASSWORD
 
 ---
@@ -44,5 +44,5 @@ spec:
   data:
     - secretKey: password
       remoteRef:
-        key: postgresql
+        key: storage/postgresql
         property: PASSWORD
diff --git a/velero/manifests/secret.yaml b/velero/manifests/secret.yaml
index a5ff721..6785660 100644
--- a/velero/manifests/secret.yaml
+++ b/velero/manifests/secret.yaml
@@ -21,11 +21,11 @@ spec:
   data:
     - secretKey: minioAccessKey
       remoteRef:
-        key: minio
+        key: storage/minio
         property: ROOT_USER
     - secretKey: minioSecretKey
       remoteRef:
-        key: minio
+        key: storage/minio
         property: ROOT_PASSWORD
 
 ---
@@ -45,9 +45,9 @@ spec:
   data:
     - secretKey: username
       remoteRef:
-        key: velero
+        key: storage/velero
         property: UI_USERNAME
     - secretKey: password
       remoteRef:
-        key: velero
+        key: storage/velero
         property: UI_PASSWORD
diff --git a/zot/manifests/secret.yaml b/zot/manifests/secret.yaml
index e90bab0..fcd9966 100644
--- a/zot/manifests/secret.yaml
+++ b/zot/manifests/secret.yaml
@@ -14,7 +14,7 @@ spec:
   data:
   - secretKey: htpasswd
     remoteRef:
-      key: zot
+      key: storage/zot
       property: HTPASSWD
 ---
 apiVersion: external-secrets.io/v1
@@ -41,11 +41,11 @@ spec:
   data:
   - secretKey: client_id
     remoteRef:
-      key: zot
+      key: storage/zot
       property: OIDC_CLIENT_ID
   - secretKey: client_secret
     remoteRef:
-      key: zot
+      key: storage/zot
       property: OIDC_CLIENT_SECRET
 ---
 apiVersion: external-secrets.io/v1
@@ -72,9 +72,9 @@ spec:
   data:
   - secretKey: hashKey
     remoteRef:
-      key: zot
+      key: storage/zot
       property: SESSION_HASH_KEY
   - secretKey: encryptKey
     remoteRef:
-      key: zot
+      key: storage/zot
       property: SESSION_BLOCK_KEY