diff --git a/charts/crunchy-postgres/templates/PostgresCluster.yaml b/charts/crunchy-postgres/templates/PostgresCluster.yaml
index 7ed5cdd..d90cadc 100644
--- a/charts/crunchy-postgres/templates/PostgresCluster.yaml
+++ b/charts/crunchy-postgres/templates/PostgresCluster.yaml
@@ -72,8 +72,11 @@ spec:
                     postgres-operator.crunchydata.com/cluster:
                       {{ template "crunchy-postgres.fullname" . }}
                     postgres-operator.crunchydata.com/instance-set: {{ .Values.instances.name }}-ha
-  
-  users:
+                    
+  users: 
+{{- if .Values.users }}
+{{ toYaml .Values.users | nindent 4 }}
+{{- else }}
     - name: {{ template "crunchy-postgres.fullname" . }}
       databases:
         - {{ template "crunchy-postgres.fullname" . }}
@@ -81,7 +84,8 @@ spec:
     - name: postgres
       databases:
         - {{ template "crunchy-postgres.fullname" . }}
-  
+  {{- end }}
+
   backups:
     pgbackrest:
       {{ if .Values.pgBackRest.image }}
@@ -194,4 +198,4 @@ spec:
                   matchLabels:
                     postgres-operator.crunchydata.com/cluster:
                       {{ .Values.instances.name }}
-                    postgres-operator.crunchydata.com/role: pgbouncer
+                    postgres-operator.crunchydata.com/role: pgbouncer
\ No newline at end of file