diff --git a/apps/attachments/base/helmrelease.yaml b/apps/attachments/base/helmrelease.yaml
index 5857773..a7a5e46 100644
--- a/apps/attachments/base/helmrelease.yaml
+++ b/apps/attachments/base/helmrelease.yaml
@@ -90,9 +90,9 @@ spec:
             vault.hashicorp.com/agent-inject-secret-attachments-db: secrets/data/postgresql/apps/attachments
             vault.hashicorp.com/agent-inject-template-attachments-db: |-
               {{- with secret "secrets/data/postgresql/apps/attachments" -}}
-              DATABASE_HOST=postgresql.attachments.svc.cluster.local
-              DATABASE_PORT=5432
-              DATABASE_NAME=attachments_db
+              DATABASE_HOST={{ index .Data.data "host" }}
+              DATABASE_PORT={{ index .Data.data "port" }}
+              DATABASE_NAME={{ index .Data.data "database" }}
               DATABASE_USER={{ index .Data.data "username" }}
               DATABASE_PASSWORD={{ index .Data.data "password" }}
               DATABASE_SSL_MODE=disable
diff --git a/apps/notes/base/backend.yaml b/apps/notes/base/backend.yaml
index e6f4de4..575fae6 100644
--- a/apps/notes/base/backend.yaml
+++ b/apps/notes/base/backend.yaml
@@ -123,9 +123,6 @@ spec:
           - name: ATTACHMENT_HOST
             value:
               _default: http://attachments-service.attachments.svc.cluster.local:80/api/v1
-          - name: PG_PORT
-            value:
-              _default: "5432"
         podAnnotations:
           _default:
             traffic.sidecar.istio.io/excludeOutboundPorts: "8200"