diff --git a/Chart.yaml b/Chart.yaml
index 9f1b63d..f2a070d 100644
--- a/Chart.yaml
+++ b/Chart.yaml
@@ -1,4 +1,4 @@
 apiVersion: v1
 name: pgdog
-version: v0.90
-appVersion: "v0.1.60"
+version: v0.91
+appVersion: "v0.1.61"
diff --git a/templates/secrets.yaml b/templates/secrets.yaml
index 33c3859..03d8ed1 100644
--- a/templates/secrets.yaml
+++ b/templates/secrets.yaml
@@ -2,14 +2,13 @@
 {{- range .Values.users }}
 [[users]]
 name = {{ .name | quote }}
-{{- if .databases }}
+{{- if hasKey . "allDatabases" }}
+all_databases = {{ .allDatabases }}
+{{- else if .databases }}
 databases = [{{ range $i, $d := .databases }}{{ if $i }}, {{ end }}{{ $d | quote }}{{ end }}]
 {{- else }}
 database = {{ .database | quote }}
 {{- end }}
-{{- if hasKey . "allDatabases" }}
-all_databases = {{ .allDatabases }}
-{{- end }}
 {{- if hasKey . "authType" }}
 auth_type = {{ .authType | quote }}
 {{- end }}
diff --git a/test/values-all-databases.yaml b/test/values-all-databases.yaml
new file mode 100644
index 0000000..293ea5a
--- /dev/null
+++ b/test/values-all-databases.yaml
@@ -0,0 +1,9 @@
+# allDatabases takes precedence over both database selectors when specified.
+users:
+  - name: all_databases_true
+    allDatabases: true
+databases:
+  - name: primary
+    host: 127.0.0.1
+  - name: secondary
+    host: 10.0.0.1