diff --git a/addons/rds-postgresql-aurora/templates/_helpers.tpl b/addons/rds-postgresql-aurora/templates/_helpers.tpl
index b7209cd93..ba6f49ff6 100644
--- a/addons/rds-postgresql-aurora/templates/_helpers.tpl
+++ b/addons/rds-postgresql-aurora/templates/_helpers.tpl
@@ -29,3 +29,11 @@
     {{- (include "generate_static_password" .) -}}
   {{- end -}}
 {{- end -}}
+
+{{- define "database_name" -}}
+{{- if .Values.config.databaseName -}}
+{{- .Values.config.databaseName -}}
+{{- else -}}
+{{- .Values.config.name | snakecase | nospace -}}
+{{- end -}}
+{{- end -}}
diff --git a/addons/rds-postgresql-aurora/templates/db_instance.yaml b/addons/rds-postgresql-aurora/templates/db_instance.yaml
index 18e84c10f..8829507d7 100644
--- a/addons/rds-postgresql-aurora/templates/db_instance.yaml
+++ b/addons/rds-postgresql-aurora/templates/db_instance.yaml
@@ -11,7 +11,7 @@ metadata:
 spec:
   autoMinorVersionUpgrade: true
   backupRetentionPeriod: 14
-  databaseName: {{ .Values.config.name | snakecase | nospace }}
+  databaseName: "{{- include "database_name" . }}"
   dbSubnetGroupRef:
     from:
       name: {{ .Values.config.name }}
diff --git a/addons/rds-postgresql-aurora/values.yaml b/addons/rds-postgresql-aurora/values.yaml
index 8c7f3c22c..f2b973ff3 100644
--- a/addons/rds-postgresql-aurora/values.yaml
+++ b/addons/rds-postgresql-aurora/values.yaml
@@ -1,4 +1,5 @@
 config:
+  databaseName: ""
   engineVersion: 15.3
   instanceClass: db.t4g.medium
   masterUsername: root
diff --git a/addons/rds-postgresql/templates/_helpers.tpl b/addons/rds-postgresql/templates/_helpers.tpl
index b7209cd93..ba6f49ff6 100644
--- a/addons/rds-postgresql/templates/_helpers.tpl
+++ b/addons/rds-postgresql/templates/_helpers.tpl
@@ -29,3 +29,11 @@
     {{- (include "generate_static_password" .) -}}
   {{- end -}}
 {{- end -}}
+
+{{- define "database_name" -}}
+{{- if .Values.config.databaseName -}}
+{{- .Values.config.databaseName -}}
+{{- else -}}
+{{- .Values.config.name | snakecase | nospace -}}
+{{- end -}}
+{{- end -}}
diff --git a/addons/rds-postgresql/templates/db_instance.yaml b/addons/rds-postgresql/templates/db_instance.yaml
index b540a446a..647ac9d53 100644
--- a/addons/rds-postgresql/templates/db_instance.yaml
+++ b/addons/rds-postgresql/templates/db_instance.yaml
@@ -16,7 +16,7 @@ spec:
   copyTagsToSnapshot: true
   dbInstanceClass: {{ .Values.config.instanceClass }}
   dbInstanceIdentifier: {{ .Values.config.name }}
-  dbName: {{ .Values.config.name | snakecase | nospace }}
+  dbName: "{{- include "database_name" . }}"
   dbSubnetGroupRef:
     from:
       name: {{ .Values.config.name }}
diff --git a/addons/rds-postgresql/values.yaml b/addons/rds-postgresql/values.yaml
index 6d8388bf2..dc6e28708 100644
--- a/addons/rds-postgresql/values.yaml
+++ b/addons/rds-postgresql/values.yaml
@@ -1,5 +1,6 @@
 config:
   allocatedStorage: 30
+  databaseName: ""
   engineVersion: 15.4
   instanceClass: db.t4g.small
   masterUsername: root