diff --git a/charts/backstage/values.schema.json b/charts/backstage/values.schema.json
index 735ec3c3..f2bb9fd1 100644
--- a/charts/backstage/values.schema.json
+++ b/charts/backstage/values.schema.json
@@ -2431,8 +2431,8 @@
                                     "name": "POSTGRESQL_ADMIN_PASSWORD",
                                     "valueFrom": {
                                         "secretKeyRef": {
-                                            "key": "postgres-password",
-                                            "name": "{{- include \"janus-idp.postgresql.secretName\" . }}"
+                                            "key": "{{- include \"postgresql.adminPasswordKey\" . }}",
+                                            "name": "{{- include \"postgresql.v1.secretName\" . }}"
                                         }
                                     }
                                 }
diff --git a/charts/backstage/values.yaml b/charts/backstage/values.yaml
index 1e8b7ea5..9dc5ed7c 100644
--- a/charts/backstage/values.yaml
+++ b/charts/backstage/values.yaml
@@ -130,8 +130,8 @@ upstream:
       - name: POSTGRESQL_ADMIN_PASSWORD
         valueFrom:
           secretKeyRef:
-            key: postgres-password
-            name: '{{- include "janus-idp.postgresql.secretName" . }}'
+            key: '{{- include "postgresql.adminPasswordKey" . }}'
+            name: '{{- include "postgresql.v1.secretName" . }}'
     args:
       # This additional `app-config`` file is generated by the initContainer below, and contains the merged configuration of installed dynamic plugins.
       - "--config"
@@ -264,7 +264,7 @@ upstream:
         - name: POSTGRESQL_ADMIN_PASSWORD
           valueFrom:
             secretKeyRef:
-              key: postgres-password
+              key: '{{- include "postgresql.adminPasswordKey" . }}'
               name: '{{- include "postgresql.v1.secretName" . }}'
   service:
     extraPorts: