diff --git a/minio/vault/minio-root-password.yaml b/minio/vault/minio-root-password.yaml
index e8bb40b..94af57a 100644
--- a/minio/vault/minio-root-password.yaml
+++ b/minio/vault/minio-root-password.yaml
@@ -14,17 +14,17 @@ spec:
   data:
     - secretKey: root-user
       remoteRef:
-        key: minio/root
+        key: databases/minio
         property: ROOT_USER
     - secretKey: root-password
       remoteRef:
-        key: minio/root
+        key: databases/minio
         property: ROOT_PASSWORD
     - secretKey: rootUser
       remoteRef:
-        key: minio/root
+        key: databases/minio
         property: ROOT_USER
     - secretKey: rootPassword
       remoteRef:
-        key: minio/root
+        key: databases/minio
         property: ROOT_PASSWORD
diff --git a/pgweb/vault/pgweb-secret.yaml b/pgweb/vault/pgweb-secret.yaml
index e7943f7..dbc1ac9 100644
--- a/pgweb/vault/pgweb-secret.yaml
+++ b/pgweb/vault/pgweb-secret.yaml
@@ -14,13 +14,13 @@ spec:
   data:
     - secretKey: database-url
       remoteRef:
-        key: pgweb/dev
+        key: databases/pgweb
         property: DATABASE_URL
     - secretKey: auth-user
       remoteRef:
-        key: pgweb/dev
+        key: databases/pgweb
         property: AUTH_USER
     - secretKey: auth-password
       remoteRef:
-        key: pgweb/dev
+        key: databases/pgweb
         property: AUTH_PASSWORD
diff --git a/postgresql-dev/vault/postgresql-password-dev.yaml b/postgresql-dev/vault/postgresql-password-dev.yaml
index a9d5056..34357ee 100644
--- a/postgresql-dev/vault/postgresql-password-dev.yaml
+++ b/postgresql-dev/vault/postgresql-password-dev.yaml
@@ -14,9 +14,9 @@ spec:
   data:
     - secretKey: password
       remoteRef:
-        key: postgresql-dev/root
+        key: databases/postgresql-dev
         property: PASSWORD
     - secretKey: postgres-password
       remoteRef:
-        key: postgresql-dev/root
+        key: databases/postgresql-dev
         property: POSTGRES_PASSWORD
diff --git a/postgresql/vault/postgresql-password.yaml b/postgresql/vault/postgresql-password.yaml
index e08e9c4..77bbd7a 100644
--- a/postgresql/vault/postgresql-password.yaml
+++ b/postgresql/vault/postgresql-password.yaml
@@ -14,13 +14,13 @@ spec:
   data:
     - secretKey: password
       remoteRef:
-        key: postgresql/root
+        key: databases/postgresql
         property: PASSWORD
     - secretKey: postgres-password
       remoteRef:
-        key: postgresql/root
+        key: databases/postgresql
         property: POSTGRES_PASSWORD
     - secretKey: replication-password
       remoteRef:
-        key: postgresql/root
+        key: databases/postgresql
         property: REPLICATION_PASSWORD