diff --git a/charts/postgres-cluster/Chart.yaml b/charts/postgres-cluster/Chart.yaml
index 71707fa..b5fe347 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.5
+version: 3.20.6
 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 fcdf34c..baa9950 100644
--- a/charts/postgres-cluster/templates/_bootstrap.tpl
+++ b/charts/postgres-cluster/templates/_bootstrap.tpl
@@ -37,7 +37,12 @@ bootstrap:
     {{- end }}
 {{- else if eq .Values.mode "replica" }}
   initdb:
-    database: jellyplist
+    {{- with .Values.replica.importDatabaseName }}
+    database: {{ . }}
+    {{- end }}
+    {{- with .Values.replica.importOwner }}
+    owner: {{ . }}
+    {{- end }}
     import:
       type: {{ .Values.replica.importType }}
       databases:
diff --git a/charts/postgres-cluster/templates/cluster.yaml b/charts/postgres-cluster/templates/cluster.yaml
index adea04d..f56ef91 100644
--- a/charts/postgres-cluster/templates/cluster.yaml
+++ b/charts/postgres-cluster/templates/cluster.yaml
@@ -60,4 +60,5 @@ spec:
     enablePodMonitor: {{ and .Values.cluster.monitoring.enabled .Values.cluster.monitoring.podMonitor.enabled }}
 
   {{ include "cluster.bootstrap" . | nindent 2 }}
+
   {{ include "cluster.backup" . | nindent 2 }}
diff --git a/charts/postgres-cluster/values.yaml b/charts/postgres-cluster/values.yaml
index 824e15e..af2a3af 100644
--- a/charts/postgres-cluster/values.yaml
+++ b/charts/postgres-cluster/values.yaml
@@ -142,6 +142,9 @@ replica:
   # If type microservice select the name for the imported database.
   importDatabaseName: app
 
+  # If type microservice select the name for the database owner.
+  importOwner: app
+
   # If type microservice no roles are imported and ignored
   importRoles: []