diff --git a/charts/postgres-cluster/Chart.yaml b/charts/postgres-cluster/Chart.yaml
index b2c3cbb..61b5619 100644
--- a/charts/postgres-cluster/Chart.yaml
+++ b/charts/postgres-cluster/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: postgres-cluster
-version: 3.20.3
+version: 3.20.4
 description: Chart for cloudnative-pg cluster
 keywords:
   - database
diff --git a/charts/postgres-cluster/templates/_bootstrap.tpl b/charts/postgres-cluster/templates/_bootstrap.tpl
index e48e5e8..0e7b9ce 100644
--- a/charts/postgres-cluster/templates/_bootstrap.tpl
+++ b/charts/postgres-cluster/templates/_bootstrap.tpl
@@ -37,7 +37,7 @@ bootstrap:
     {{- end }}
 {{- else if eq .Values.mode "replica" }}
   initdb:
-    database: {{ first .Values.replica.importDatabases }}
+    database: {{ .Values.replica.importDatabaseName }}
     import:
       type: {{ .Values.replica.importType }}
       databases:
diff --git a/charts/postgres-cluster/values.yaml b/charts/postgres-cluster/values.yaml
index c70cb60..824e15e 100644
--- a/charts/postgres-cluster/values.yaml
+++ b/charts/postgres-cluster/values.yaml
@@ -139,6 +139,9 @@ replica:
   importDatabases:
     - app
 
+  # If type microservice select the name for the imported database.
+  importDatabaseName: app
+
   # If type microservice no roles are imported and ignored
   importRoles: []