diff --git a/charts/caduser/v0.1.0/templates/postgresql-cluster.yaml b/charts/caduser/v0.1.0/templates/postgresql-cluster.yaml
index f7075e3..11a0a12 100644
--- a/charts/caduser/v0.1.0/templates/postgresql-cluster.yaml
+++ b/charts/caduser/v0.1.0/templates/postgresql-cluster.yaml
@@ -14,9 +14,9 @@ spec:
     initdb:
       database: {{ .Values.postgresql.databaseName }}
       owner: {{ .Values.postgresql.owner }}
-      localeCollate: {{ .Values.postgresql.initdb.localeCollate }}
-      localeCType: {{ .Values.postgresql.initdb.localeCType }}
-      encoding: {{ .Values.postgresql.initdb.encoding }}
+      {{- with .Values.postgresql.initdb }}
+      {{- toYaml . | nindent 6 }}
+      {{- end }}
   
   storage:
     size: {{ .Values.postgresql.storageSize }}
diff --git a/charts/caduser/v0.1.0/values.yaml b/charts/caduser/v0.1.0/values.yaml
index ac949c8..d3013a2 100644
--- a/charts/caduser/v0.1.0/values.yaml
+++ b/charts/caduser/v0.1.0/values.yaml
@@ -86,9 +86,11 @@ postgresql:
   superuserSecret: ""  # If empty, will be auto-generated
   # Locale settings for Brazilian Portuguese
   initdb:
-    localeCollate: pt_BR.UTF-8
-    localeCType: pt_BR.UTF-8
     encoding: UTF8
+    localeProvider: icu
+    icuLocale: pt-BR
+    # Additional initdb parameters can be added here
+    
   resources:
     requests:
       cpu: 40m