diff --git a/apps/attachments/base/helmrelease.yaml b/apps/attachments/base/helmrelease.yaml
index a7a5e46..aee5f94 100644
--- a/apps/attachments/base/helmrelease.yaml
+++ b/apps/attachments/base/helmrelease.yaml
@@ -87,9 +87,9 @@ spec:
             vault.hashicorp.com/agent-pre-populate-only: "true"
             vault.hashicorp.com/auth-path: auth/kubernetes
             vault.hashicorp.com/role: attachments
-            vault.hashicorp.com/agent-inject-secret-attachments-db: secrets/data/postgresql/apps/attachments
+            vault.hashicorp.com/agent-inject-secret-attachments-db: secrets/data/apps/attachments/postgres
             vault.hashicorp.com/agent-inject-template-attachments-db: |-
-              {{- with secret "secrets/data/postgresql/apps/attachments" -}}
+              {{- with secret "secrets/data/apps/attachments/postgres" -}}
               DATABASE_HOST={{ index .Data.data "host" }}
               DATABASE_PORT={{ index .Data.data "port" }}
               DATABASE_NAME={{ index .Data.data "database" }}
diff --git a/apps/bim/base/backend.yaml b/apps/bim/base/backend.yaml
index b424252..0d332eb 100644
--- a/apps/bim/base/backend.yaml
+++ b/apps/bim/base/backend.yaml
@@ -186,9 +186,9 @@ spec:
             vault.hashicorp.com/agent-pre-populate-only: "true"
             vault.hashicorp.com/auth-path: auth/kubernetes
             vault.hashicorp.com/role: bim
-            vault.hashicorp.com/agent-inject-secret-bim-postgresql: secrets/data/postgresql/apps/bim
+            vault.hashicorp.com/agent-inject-secret-bim-postgresql: secrets/data/apps/bim/postgres
             vault.hashicorp.com/agent-inject-template-bim-postgresql: |-
-              {{- with secret "secrets/data/postgresql/apps/bim" -}}
+              {{- with secret "secrets/data/apps/bim/postgres" -}}
               POSTGRES_ADDRESS=postgresql.bim.svc.cluster.local
               POSTGRES_ADDRESS_2=postgresql.bim.svc.cluster.local
               POSTGRES_ADDRESS_3=postgresql.bim.svc.cluster.local
diff --git a/apps/comparisons/base/backend.yaml b/apps/comparisons/base/backend.yaml
index cdb60db..df630ff 100644
--- a/apps/comparisons/base/backend.yaml
+++ b/apps/comparisons/base/backend.yaml
@@ -244,9 +244,9 @@ spec:
             vault.hashicorp.com/agent-pre-populate-only: "true"
             vault.hashicorp.com/auth-path: auth/kubernetes
             vault.hashicorp.com/role: comparisons
-            vault.hashicorp.com/agent-inject-secret-comparisons-db: secrets/data/postgresql/apps/comparisons
+            vault.hashicorp.com/agent-inject-secret-comparisons-db: secrets/data/apps/comparisons/postgres
             vault.hashicorp.com/agent-inject-template-comparisons-db: |-
-              {{- with secret "secrets/data/postgresql/apps/comparisons" -}}
+              {{- with secret "secrets/data/apps/comparisons/postgres" -}}
               DATABASE_HOST=postgresql.comparisons.svc.cluster.local
               DATABASE_PORT=5432
               DATABASE_DB=comparisons_db
diff --git a/apps/contracts/base/helmrelease.yaml b/apps/contracts/base/helmrelease.yaml
index 4cb4942..a42e8ae 100644
--- a/apps/contracts/base/helmrelease.yaml
+++ b/apps/contracts/base/helmrelease.yaml
@@ -90,9 +90,9 @@ spec:
             vault.hashicorp.com/agent-pre-populate-only: "true"
             vault.hashicorp.com/auth-path: auth/kubernetes
             vault.hashicorp.com/role: contracts
-            vault.hashicorp.com/agent-inject-secret-contracts-db: secrets/data/postgresql/apps/contracts
+            vault.hashicorp.com/agent-inject-secret-contracts-db: secrets/data/apps/contracts/postgres
             vault.hashicorp.com/agent-inject-template-contracts-db: |-
-              {{- with secret "secrets/data/postgresql/apps/contracts" -}}
+              {{- with secret "secrets/data/apps/contracts/postgres" -}}
               DB_URL=postgresql://{{ index .Data.data "username" }}:{{ index .Data.data "password" }}@postgresql.contracts.svc.cluster.local:5432/contracts_db?sslmode=disable
               {{- end -}}
             vault.hashicorp.com/agent-inject-secret-contracts-jwt-public: secrets/data/vault/common/rsa_keys
diff --git a/apps/drawings/base/backend.yaml b/apps/drawings/base/backend.yaml
index 341bdb6..1c309e0 100644
--- a/apps/drawings/base/backend.yaml
+++ b/apps/drawings/base/backend.yaml
@@ -119,9 +119,9 @@ spec:
             vault.hashicorp.com/agent-pre-populate-only: "true"
             vault.hashicorp.com/auth-path: auth/kubernetes
             vault.hashicorp.com/role: drawings
-            vault.hashicorp.com/agent-inject-secret-drawings-db: secrets/data/postgresql/apps/drawings
+            vault.hashicorp.com/agent-inject-secret-drawings-db: secrets/data/apps/drawings/postgres
             vault.hashicorp.com/agent-inject-template-drawings-db: |-
-              {{- with secret "secrets/data/postgresql/apps/drawings" -}}
+              {{- with secret "secrets/data/apps/drawings/postgres" -}}
               POSTGRES_ADDRESS=postgresql.drawings.svc.cluster.local:5432
               POSTGRES_DB=drawings_db
               POSTGRES_USER={{ index .Data.data "username" }}
diff --git a/apps/flows/base/backend.yaml b/apps/flows/base/backend.yaml
index f0101d9..1e7eb39 100644
--- a/apps/flows/base/backend.yaml
+++ b/apps/flows/base/backend.yaml
@@ -217,9 +217,9 @@ spec:
             vault.hashicorp.com/agent-pre-populate-only: "true"
             vault.hashicorp.com/auth-path: auth/kubernetes
             vault.hashicorp.com/role: flows
-            vault.hashicorp.com/agent-inject-secret-flows-postgresql: secrets/data/postgresql/apps/flows
+            vault.hashicorp.com/agent-inject-secret-flows-postgresql: secrets/data/apps/flows/postgres
             vault.hashicorp.com/agent-inject-template-flows-postgresql: |-
-              {{- with secret "secrets/data/postgresql/apps/flows" -}}
+              {{- with secret "secrets/data/apps/flows/postgres" -}}
               PG_DB={{ index .Data.data "database" }}
               PG_LOGIN={{ index .Data.data "username" }}
               PG_HOST={{ index .Data.data "host" }}
diff --git a/apps/flows/base/celery.yaml b/apps/flows/base/celery.yaml
index b7893bd..0c90eb6 100644
--- a/apps/flows/base/celery.yaml
+++ b/apps/flows/base/celery.yaml
@@ -202,9 +202,9 @@ spec:
             vault.hashicorp.com/agent-pre-populate-only: "true"
             vault.hashicorp.com/auth-path: auth/kubernetes
             vault.hashicorp.com/role: flows
-            vault.hashicorp.com/agent-inject-secret-flows-postgresql: secrets/data/postgresql/apps/flows
+            vault.hashicorp.com/agent-inject-secret-flows-postgresql: secrets/data/apps/flows/postgres
             vault.hashicorp.com/agent-inject-template-flows-postgresql: |-
-              {{- with secret "secrets/data/postgresql/apps/flows" -}}
+              {{- with secret "secrets/data/apps/flows/postgres" -}}
               PG_DB=flows_db
               PG_LOGIN={{ index .Data.data "username" }}
               PG_HOST=postgresql.flows.svc.cluster.local
diff --git a/apps/inspections/base/backend-deployment.yaml b/apps/inspections/base/backend-deployment.yaml
deleted file mode 100644
index a61a392..0000000
--- a/apps/inspections/base/backend-deployment.yaml
+++ /dev/null
@@ -1,120 +0,0 @@
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: inspections-backend
-  namespace: inspections
-  labels:
-    app: inspections-backend
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: inspections-backend
-  template:
-    metadata:
-      labels:
-        app: inspections-backend
-      annotations:
-        traffic.sidecar.istio.io/excludeOutboundPorts: "8200"
-        vault.hashicorp.com/agent-init-first: "true"
-        vault.hashicorp.com/agent-inject: "true"
-        vault.hashicorp.com/agent-pre-populate-only: "true"
-        vault.hashicorp.com/auth-path: auth/kubernetes
-        vault.hashicorp.com/role: inspections
-        vault.hashicorp.com/agent-inject-secret-inspections-db: secrets/data/postgresql/apps/inspections
-        vault.hashicorp.com/agent-inject-template-inspections-db: |-
-          {{- with secret "secrets/data/postgresql/apps/inspections" -}}
-          DATABASE_HOST=postgresql.inspections.svc.cluster.local
-          DATABASE_PORT=5432
-          DATABASE_NAME=inspections_db
-          DATABASE_USER={{ index .Data.data "username" }}
-          DATABASE_PASSWORD={{ index .Data.data "password" }}
-          {{- end -}}
-        vault.hashicorp.com/agent-inject-secret-inspections-kafka: secrets/data/kafka/apps/inspections
-        vault.hashicorp.com/agent-inject-template-inspections-kafka: |-
-          {{- with secret "secrets/data/kafka/apps/inspections" -}}
-          KAFKA_HOST={{ index .Data.data.auth "bootstrap_servers" }}
-          KAFKA_USERNAME={{ index .Data.data "username" }}
-          KAFKA_PASSWORD={{ index .Data.data "password" }}
-          {{- end -}}
-        vault.hashicorp.com/agent-inject-secret-inspections-django-auth: secrets/data/vault/common/django_auth
-        vault.hashicorp.com/agent-inject-template-inspections-django-auth: |-
-          {{- with secret "secrets/data/vault/common/django_auth" -}}
-          SAREX_BACKEND_AUTH={{ index .Data.data "key" }}
-          {{- end -}}
-    spec:
-      serviceAccountName: inspections-vault
-      containers:
-        - name: inspections-backend
-          image: cr.yandex/crp3ccidau046kdj8g9q/sarex-inspections:production_1a33f6f4
-          imagePullPolicy: IfNotPresent
-          command: ["/bin/bash", "-ec"]
-          args:
-            - |
-              set -a
-              [ -f /vault/secrets/inspections-db ] && . /vault/secrets/inspections-db
-              [ -f /vault/secrets/inspections-kafka ] && . /vault/secrets/inspections-kafka
-              [ -f /vault/secrets/inspections-django-auth ] && . /vault/secrets/inspections-django-auth
-              set +a
-              exec ./entrypoint.sh
-          ports:
-            - name: http
-              containerPort: 8000
-              protocol: TCP
-          env:
-            - name: DEBUG
-              value: "false"
-            - name: SERVICE_URL
-              value: https://srx.wb.ru
-            - name: HTTP_APP_HOST
-              value: 0.0.0.0
-            - name: HTTP_APP_PORT
-              value: "8000"
-            - name: HTTP_APP_ROOT_PATH
-              value: /inspections
-            - name: HTTP_APP_WORKERS
-              value: "3"
-            - name: HTTP_APP_ADMIN_ENABLE
-              value: "true"
-            - name: KAFKA_SSL_CAFILE
-              value: /usr/local/share/ca-certificates/Yandex/YandexInternalRootCA.crt
-            - name: KAFKA_EAV_ASSETS_TOPIC
-              value: assets_broadcast
-            - name: JWT_AUTH_ENABLE
-              value: "true"
-            - name: NOTIFICATIONS_ENABLE
-              value: "true"
-            - name: NOTIFICATIONS_EMAIL_FROM
-              value: hello@sarex.io
-            - name: SAREX_BACKEND_URL
-              value: https://srx.wb.ru
-            - name: SAREX_BACKEND_TIMEOUT
-              value: "30"
-            - name: EAV_URL
-              value: http://eav-service.eav
-            - name: EAV_TIMEOUT
-              value: "30"
-            - name: WORKFLOWS_URL
-              value: http://workflows-service.processing-prod
-            - name: WORKFLOWS_TIMEOUT
-              value: "30"
-            - name: WORKFLOWS_EMAIL_DOCKER_IMAGE
-              value: cr.yandex/crp3ccidau046kdj8g9q/notification:email
-            - name: MOBILE_APP_CURRENT_VERSION
-              value: 1.0.0
-            - name: MOBILE_APP_RECOMMENDED_VERSION
-              value: 1.0.0
-            - name: MOBILE_APP_REQUIRED_VERSION
-              value: 1.0.0
-            - name: MAILER_URL
-              value: http://mailer-service.mailer:8000
-            - name: MAILER_TIMEOUT
-              value: "30"
-
-          resources:
-            requests:
-              cpu: "25m"
-              memory: 128Mi
-      imagePullSecrets:
-        - name: regcred
diff --git a/apps/inspections/base/backend.yaml b/apps/inspections/base/backend.yaml
index b8f1da9..017a83f 100644
--- a/apps/inspections/base/backend.yaml
+++ b/apps/inspections/base/backend.yaml
@@ -212,9 +212,9 @@ spec:
             vault.hashicorp.com/agent-pre-populate-only: "true"
             vault.hashicorp.com/auth-path: auth/kubernetes
             vault.hashicorp.com/role: inspections
-            vault.hashicorp.com/agent-inject-secret-inspections-db: secrets/data/postgresql/apps/inspections
+            vault.hashicorp.com/agent-inject-secret-inspections-db: secrets/data/apps/inspections/postgres
             vault.hashicorp.com/agent-inject-template-inspections-db: |-
-              {{- with secret "secrets/data/postgresql/apps/inspections" -}}
+              {{- with secret "secrets/data/apps/inspections/postgres" -}}
               DATABASE_HOST=postgresql.inspections.svc.cluster.local
               DATABASE_PORT=5432
               DATABASE_NAME=inspections_db
diff --git a/apps/issues/base/backend.yaml b/apps/issues/base/backend.yaml
index 9644a58..77cee41 100644
--- a/apps/issues/base/backend.yaml
+++ b/apps/issues/base/backend.yaml
@@ -188,9 +188,9 @@ spec:
             vault.hashicorp.com/agent-pre-populate-only: "true"
             vault.hashicorp.com/auth-path: auth/kubernetes
             vault.hashicorp.com/role: issues
-            vault.hashicorp.com/agent-inject-secret-issues-db: secrets/data/postgresql/apps/issues
+            vault.hashicorp.com/agent-inject-secret-issues-db: secrets/data/apps/issues/postgres
             vault.hashicorp.com/agent-inject-template-issues-db: |-
-              {{- with secret "secrets/data/postgresql/apps/issues" -}}
+              {{- with secret "secrets/data/apps/issues/postgres" -}}
               DATABASE_PORT=5432
               DATABASE_HOST=postgresql.issues.svc.cluster.local
               DATABASE_USER={{ index .Data.data "username" }}
diff --git a/apps/issues/base/celery.yaml b/apps/issues/base/celery.yaml
index c8eeefe..6158e30 100644
--- a/apps/issues/base/celery.yaml
+++ b/apps/issues/base/celery.yaml
@@ -173,9 +173,9 @@ spec:
             vault.hashicorp.com/agent-pre-populate-only: "true"
             vault.hashicorp.com/auth-path: auth/kubernetes
             vault.hashicorp.com/role: issues
-            vault.hashicorp.com/agent-inject-secret-issues-db: secrets/data/postgresql/apps/issues
+            vault.hashicorp.com/agent-inject-secret-issues-db: secrets/data/apps/issues/postgres
             vault.hashicorp.com/agent-inject-template-issues-db: |-
-              {{- with secret "secrets/data/postgresql/apps/issues" -}}
+              {{- with secret "secrets/data/apps/issues/postgres" -}}
               DATABASE_PORT=5432
               DATABASE_HOST=postgresql.issues.svc.cluster.local
               DATABASE_USER={{ index .Data.data "username" }}
diff --git a/apps/mapper/base/backend.yaml b/apps/mapper/base/backend.yaml
index b5bf4d2..bacb7d8 100644
--- a/apps/mapper/base/backend.yaml
+++ b/apps/mapper/base/backend.yaml
@@ -147,9 +147,9 @@ spec:
               {{- with secret "secrets/data/vault/common/django_auth" -}}
               MAPPER_DJANGO_TOKEN={{ index .Data.data "key" }}
               {{- end -}}
-            vault.hashicorp.com/agent-inject-secret-mapper-db: secrets/data/postgresql/apps/mapper
+            vault.hashicorp.com/agent-inject-secret-mapper-db: secrets/data/apps/mapper/postgres
             vault.hashicorp.com/agent-inject-template-mapper-db: |-
-              {{- with secret "secrets/data/postgresql/apps/mapper" -}}
+              {{- with secret "secrets/data/apps/mapper/postgres" -}}
               MAPPER_DB_USER={{ index .Data.data "username" }}
               MAPPER_DB_PASSWORD={{ index .Data.data "password" }}
               MAPPER_DB_HOST=postgresql.mapper.svc.cluster.local
diff --git a/apps/message-hub/base/message-hub.yaml b/apps/message-hub/base/message-hub.yaml
index f9e0241..4d97f27 100644
--- a/apps/message-hub/base/message-hub.yaml
+++ b/apps/message-hub/base/message-hub.yaml
@@ -148,9 +148,9 @@ spec:
             vault.hashicorp.com/agent-pre-populate-only: "true"
             vault.hashicorp.com/auth-path: auth/kubernetes
             vault.hashicorp.com/role: message-hub
-            vault.hashicorp.com/agent-inject-secret-message-hub-db: secrets/data/postgresql/apps/message-hub
+            vault.hashicorp.com/agent-inject-secret-message-hub-db: secrets/data/apps/message-hub/postgres
             vault.hashicorp.com/agent-inject-template-message-hub-db: |-
-              {{- with secret "secrets/data/postgresql/apps/message-hub" -}}
+              {{- with secret "secrets/data/apps/message-hub/postgres" -}}
               DB_USERNAME={{ index .Data.data "username" }}
               DB_PASSWORD={{ index .Data.data "password" }}
               DB_DATABASE=pm_db
diff --git a/apps/pm/base/backend.yaml b/apps/pm/base/backend.yaml
index c103c6e..625d222 100644
--- a/apps/pm/base/backend.yaml
+++ b/apps/pm/base/backend.yaml
@@ -220,9 +220,9 @@ spec:
             vault.hashicorp.com/agent-pre-populate-only: "true"
             vault.hashicorp.com/auth-path: auth/kubernetes
             vault.hashicorp.com/role: pm
-            vault.hashicorp.com/agent-inject-secret-pm-db: secrets/data/postgresql/apps/pm
+            vault.hashicorp.com/agent-inject-secret-pm-db: secrets/data/apps/pm/postgres
             vault.hashicorp.com/agent-inject-template-pm-db: |-
-              {{- with secret "secrets/data/postgresql/apps/pm" -}}
+              {{- with secret "secrets/data/apps/pm/postgres" -}}
               DB_USERNAME={{ index .Data.data "username" }}
               DB_PASSWORD={{ index .Data.data "password" }}
               DB_DATABASE=pm_db
diff --git a/apps/pm/base/celery.yaml b/apps/pm/base/celery.yaml
index cb171f6..b9095de 100644
--- a/apps/pm/base/celery.yaml
+++ b/apps/pm/base/celery.yaml
@@ -203,9 +203,9 @@ spec:
             vault.hashicorp.com/agent-pre-populate-only: "true"
             vault.hashicorp.com/auth-path: auth/kubernetes
             vault.hashicorp.com/role: pm
-            vault.hashicorp.com/agent-inject-secret-pm-db: secrets/data/postgresql/apps/pm
+            vault.hashicorp.com/agent-inject-secret-pm-db: secrets/data/apps/pm/postgres
             vault.hashicorp.com/agent-inject-template-pm-db: |-
-              {{- with secret "secrets/data/postgresql/apps/pm" -}}
+              {{- with secret "secrets/data/apps/pm/postgres" -}}
               DB_USERNAME={{ index .Data.data "username" }}
               DB_PASSWORD={{ index .Data.data "password" }}
               DB_DATABASE=pm_db
diff --git a/apps/processing/base/api.yaml b/apps/processing/base/api.yaml
index fbfd678..31f4408 100644
--- a/apps/processing/base/api.yaml
+++ b/apps/processing/base/api.yaml
@@ -139,9 +139,9 @@ spec:
             vault.hashicorp.com/agent-pre-populate-only: "true"
             vault.hashicorp.com/auth-path: auth/kubernetes
             vault.hashicorp.com/role: processing
-            vault.hashicorp.com/agent-inject-secret-processing-postgresql: secrets/data/postgresql/apps/processing
+            vault.hashicorp.com/agent-inject-secret-processing-postgresql: secrets/data/apps/processing/postgres
             vault.hashicorp.com/agent-inject-template-processing-postgresql: |-
-              {{- with secret "secrets/data/postgresql/apps/processing" -}}
+              {{- with secret "secrets/data/apps/processing/postgres" -}}
               POSTGRES_ADDRESS=postgresql.processing.svc.cluster.local
               POSTGRES_PORT=5432
               POSTGRES_USER={{ index .Data.data "username" }}
diff --git a/apps/processing/base/engine-low.yaml b/apps/processing/base/engine-low.yaml
index 51d410b..4a59781 100644
--- a/apps/processing/base/engine-low.yaml
+++ b/apps/processing/base/engine-low.yaml
@@ -399,9 +399,9 @@ spec:
             vault.hashicorp.com/agent-pre-populate-only: "true"
             vault.hashicorp.com/auth-path: auth/kubernetes
             vault.hashicorp.com/role: processing
-            vault.hashicorp.com/agent-inject-secret-processing-postgresql: secrets/data/postgresql/apps/processing
+            vault.hashicorp.com/agent-inject-secret-processing-postgresql: secrets/data/apps/processing/postgres
             vault.hashicorp.com/agent-inject-template-processing-postgresql: |-
-              {{- with secret "secrets/data/postgresql/apps/processing" -}}
+              {{- with secret "secrets/data/apps/processing/postgres" -}}
               POSTGRES_ADDRESS=postgresql.processing.svc.cluster.local
               POSTGRES_PORT=5432
               POSTGRES_USER={{ index .Data.data "username" }}
diff --git a/apps/processing/base/engine.yaml b/apps/processing/base/engine.yaml
index 5916e90..dd43481 100644
--- a/apps/processing/base/engine.yaml
+++ b/apps/processing/base/engine.yaml
@@ -391,9 +391,9 @@ spec:
             vault.hashicorp.com/agent-pre-populate-only: "true"
             vault.hashicorp.com/auth-path: auth/kubernetes
             vault.hashicorp.com/role: processing
-            vault.hashicorp.com/agent-inject-secret-processing-postgresql: secrets/data/postgresql/apps/processing
+            vault.hashicorp.com/agent-inject-secret-processing-postgresql: secrets/data/apps/processing/postgres
             vault.hashicorp.com/agent-inject-template-processing-postgresql: |-
-              {{- with secret "secrets/data/postgresql/apps/processing" -}}
+              {{- with secret "secrets/data/apps/processing/postgres" -}}
               POSTGRES_ADDRESS=postgresql.processing.svc.cluster.local
               POSTGRES_PORT=5432
               POSTGRES_USER={{ index .Data.data "username" }}
diff --git a/apps/resources/base/backend-deployment.yaml b/apps/resources/base/backend-deployment.yaml
index 58a7475..f595f5a 100644
--- a/apps/resources/base/backend-deployment.yaml
+++ b/apps/resources/base/backend-deployment.yaml
@@ -21,9 +21,9 @@ spec:
         vault.hashicorp.com/agent-pre-populate-only: "true"
         vault.hashicorp.com/auth-path: auth/kubernetes
         vault.hashicorp.com/role: resources
-        vault.hashicorp.com/agent-inject-secret-resources-db: secrets/data/postgresql/apps/resources
+        vault.hashicorp.com/agent-inject-secret-resources-db: secrets/data/apps/resources/postgres
         vault.hashicorp.com/agent-inject-template-resources-db: |-
-          {{- with secret "secrets/data/postgresql/apps/resources" -}}
+          {{- with secret "secrets/data/apps/resources/postgres" -}}
           DATABASE_HOST=postgresql.resources.svc.cluster.local
           DATABASE_PORT=5432
           DATABASE_NAME=resources_db
diff --git a/apps/subscriptions/base/backend-deployment.yaml b/apps/subscriptions/base/backend-deployment.yaml
index b9e881d..a467eeb 100644
--- a/apps/subscriptions/base/backend-deployment.yaml
+++ b/apps/subscriptions/base/backend-deployment.yaml
@@ -22,9 +22,9 @@ spec:
         vault.hashicorp.com/agent-pre-populate-only: "true"
         vault.hashicorp.com/auth-path: auth/kubernetes
         vault.hashicorp.com/role: subscriptions
-        vault.hashicorp.com/agent-inject-secret-subscriptions-postgresql: secrets/data/postgresql/apps/subscriptions
+        vault.hashicorp.com/agent-inject-secret-subscriptions-postgresql: secrets/data/apps/subscriptions/postgres
         vault.hashicorp.com/agent-inject-template-subscriptions-postgresql: |-
-          {{- with secret "secrets/data/postgresql/apps/subscriptions" -}}
+          {{- with secret "secrets/data/apps/subscriptions/postgres" -}}
           DATABASE_HOST=postgresql.subscriptions.svc.cluster.local
           DATABASE_PORT=5432
           DATABASE_NAME=subscriptions_db
diff --git a/apps/system-log/base/api.yaml b/apps/system-log/base/api.yaml
index 2e8c0f1..7164577 100644
--- a/apps/system-log/base/api.yaml
+++ b/apps/system-log/base/api.yaml
@@ -179,9 +179,9 @@ spec:
             vault.hashicorp.com/agent-pre-populate-only: "true"
             vault.hashicorp.com/auth-path: auth/kubernetes
             vault.hashicorp.com/role: system-log
-            vault.hashicorp.com/agent-inject-secret-system-log-postgresql: secrets/data/postgresql/apps/system-log
+            vault.hashicorp.com/agent-inject-secret-system-log-postgresql: secrets/data/apps/system-log/postgres
             vault.hashicorp.com/agent-inject-template-system-log-postgresql: |-
-              {{- with secret "secrets/data/postgresql/apps/system-log" -}}
+              {{- with secret "secrets/data/apps/system-log/postgres" -}}
               POSTGRES_ADDRESS=postgresql.system-log.svc.cluster.local
               POSTGRES_PORT=5432
               POSTGRES_DB=system_log_db
diff --git a/apps/system-log/base/worker.yaml b/apps/system-log/base/worker.yaml
index a1c32e7..4dab1a9 100644
--- a/apps/system-log/base/worker.yaml
+++ b/apps/system-log/base/worker.yaml
@@ -155,9 +155,9 @@ spec:
             vault.hashicorp.com/agent-pre-populate-only: "true"
             vault.hashicorp.com/auth-path: auth/kubernetes
             vault.hashicorp.com/role: system-log
-            vault.hashicorp.com/agent-inject-secret-system-log-postgresql: secrets/data/postgresql/apps/system-log
+            vault.hashicorp.com/agent-inject-secret-system-log-postgresql: secrets/data/apps/system-log/postgres
             vault.hashicorp.com/agent-inject-template-system-log-postgresql: |-
-              {{- with secret "secrets/data/postgresql/apps/system-log" -}}
+              {{- with secret "secrets/data/apps/system-log/postgres" -}}
               POSTGRES_ADDRESS=postgresql.system-log.svc.cluster.local
               POSTGRES_PORT=5432
               POSTGRES_DB=system_log_db
diff --git a/apps/transmittal/base/backend.yaml b/apps/transmittal/base/backend.yaml
index 84ab267..4985e84 100644
--- a/apps/transmittal/base/backend.yaml
+++ b/apps/transmittal/base/backend.yaml
@@ -355,9 +355,9 @@ spec:
             vault.hashicorp.com/agent-pre-populate-only: "true"
             vault.hashicorp.com/auth-path: auth/kubernetes
             vault.hashicorp.com/role: transmittal
-            vault.hashicorp.com/agent-inject-secret-transmittal-db: secrets/data/postgresql/apps/transmittal
+            vault.hashicorp.com/agent-inject-secret-transmittal-db: secrets/data/apps/transmittal/postgres
             vault.hashicorp.com/agent-inject-template-transmittal-db: |-
-              {{- with secret "secrets/data/postgresql/apps/transmittal" -}}
+              {{- with secret "secrets/data/apps/transmittal/postgres" -}}
               TRANSMITTAL_SERVICE_DATABASE__USER={{ index .Data.data "username" }}
               TRANSMITTAL_SERVICE_DATABASE__PASSWORD={{ index .Data.data "password" }}
               TRANSMITTAL_SERVICE_DATABASE__HOST=postgresql.transmittal.svc.cluster.local
diff --git a/apps/transmittal/base/worker.yaml b/apps/transmittal/base/worker.yaml
index 53efb7a..b5ee138 100644
--- a/apps/transmittal/base/worker.yaml
+++ b/apps/transmittal/base/worker.yaml
@@ -340,9 +340,9 @@ spec:
             vault.hashicorp.com/agent-pre-populate-only: "true"
             vault.hashicorp.com/auth-path: auth/kubernetes
             vault.hashicorp.com/role: transmittal
-            vault.hashicorp.com/agent-inject-secret-transmittal-db: secrets/data/postgresql/apps/transmittal
+            vault.hashicorp.com/agent-inject-secret-transmittal-db: secrets/data/apps/transmittal/postgres
             vault.hashicorp.com/agent-inject-template-transmittal-db: |-
-              {{- with secret "secrets/data/postgresql/apps/transmittal" -}}
+              {{- with secret "secrets/data/apps/transmittal/postgres" -}}
               TRANSMITTAL_SERVICE_DATABASE__USER={{ index .Data.data "username" }}
               TRANSMITTAL_SERVICE_DATABASE__PASSWORD={{ index .Data.data "password" }}
               TRANSMITTAL_SERVICE_DATABASE__HOST=postgresql.transmittal.svc.cluster.local