diff --git a/charts/substrate-faucet/templates/configmap.yaml b/charts/substrate-faucet/templates/configmap.yaml
index ee7ebd98..571e0f6e 100644
--- a/charts/substrate-faucet/templates/configmap.yaml
+++ b/charts/substrate-faucet/templates/configmap.yaml
@@ -10,5 +10,5 @@ data:
   SMF_CONFIG_DB_HOST: "{{ .Release.Name }}-postgresql"
   SMF_CONFIG_DB_PORT: "5432"
   SMF_CONFIG_DB_USERNAME: postgres
-  SMF_CONFIG_DB_DATABASE_NAME: faucet
+  SMF_CONFIG_DB_DATABASE_NAME: "{{ .Values.postgresql.global.postgresql.auth.database }}"
 {{- end }}
diff --git a/charts/substrate-faucet/values.yaml b/charts/substrate-faucet/values.yaml
index 40d57f7b..a65102ca 100644
--- a/charts/substrate-faucet/values.yaml
+++ b/charts/substrate-faucet/values.yaml
@@ -130,6 +130,7 @@ postgresql:
   global:
     postgresql:
       auth:
+        database: faucet
         postgresPassword: "Secret!"
   primary:
     persistence: