diff --git a/templates/configmap.yaml b/templates/configmap.yaml
index ef8e67a..d5b5bfc 100644
--- a/templates/configmap.yaml
+++ b/templates/configmap.yaml
@@ -42,9 +42,9 @@ data:
 {{- end }}
 {{- if .Values.postgresql.enabled }}
   druid_metadata_storage_type: postgresql
-  druid_metadata_storage_connector_connectURI: jdbc:postgresql://{{ .Release.Name }}-postgresql:{{ .Values.postgresql.service.port}}/{{ .Values.postgresql.postgresqlDatabase }}
-  druid_metadata_storage_connector_user: {{ .Values.postgresql.postgresqlUsername }}
-  druid_metadata_storage_connector_password: {{ .Values.postgresql.postgresqlPassword }}
+  druid_metadata_storage_connector_connectURI: jdbc:postgresql://{{ .Release.Name }}-postgresql:{{ .Values.postgresql.service.port}}/{{ .Values.postgresql.auth.database }}
+  druid_metadata_storage_connector_user: {{ .Values.postgresql.auth.username }}
+  druid_metadata_storage_connector_password: {{ .Values.postgresql.auth.password }}
 {{- end }}
 {{- if .Values.gCloudStorage.enabled }}
   GOOGLE_APPLICATION_CREDENTIALS: /var/secrets/google/key.json
diff --git a/values.yaml b/values.yaml
index 3b85801..16c5c13 100644
--- a/values.yaml
+++ b/values.yaml
@@ -486,9 +486,10 @@ mysql:
 # ------------------------------------------------------------------------------
 postgresql:
   enabled: true
-  postgresqlUsername: druid
-  postgresqlPassword: druid
-  postgresqlDatabase: druid
+  auth:
+    username: druid
+    password: druid
+    database: druid
   service:
     port: 5432