diff --git a/chart/templates/cronjob-media-remove.yaml b/chart/templates/cronjob-media-remove.yaml
index 1dced69ec787bde2be84584b1a7f33c6b79656c5..160aee20421d3367b33a108463ca35c4158f734e 100644
--- a/chart/templates/cronjob-media-remove.yaml
+++ b/chart/templates/cronjob-media-remove.yaml
@@ -59,7 +59,7 @@ spec:
                   valueFrom:
                     secretKeyRef:
                       name: {{ template "mastodon.postgresql.secretName" . }}
-                      key: postgres-password
+                      key: password
                 - name: "REDIS_PASSWORD"
                   valueFrom:
                     secretKeyRef:
diff --git a/chart/templates/deployment-sidekiq.yaml b/chart/templates/deployment-sidekiq.yaml
index 4b108d79df6b2dc44447ef1ec9b2e805b73f08cf..994a66445eab255064220983ff773ab514199e20 100644
--- a/chart/templates/deployment-sidekiq.yaml
+++ b/chart/templates/deployment-sidekiq.yaml
@@ -76,7 +76,7 @@ spec:
               valueFrom:
                 secretKeyRef:
                   name: {{ template "mastodon.postgresql.secretName" . }}
-                  key: postgres-password
+                  key: password
             - name: "REDIS_PASSWORD"
               valueFrom:
                 secretKeyRef:
diff --git a/chart/templates/deployment-streaming.yaml b/chart/templates/deployment-streaming.yaml
index 564f53f433191c7f11bcd4fe0021cea9e2db69d4..12203a530bb4fd80dd6f8ea469e20a56809b2516 100644
--- a/chart/templates/deployment-streaming.yaml
+++ b/chart/templates/deployment-streaming.yaml
@@ -44,7 +44,7 @@ spec:
               valueFrom:
                 secretKeyRef:
                   name: {{ template "mastodon.postgresql.secretName" . }}
-                  key: postgres-password
+                  key: password
             - name: "REDIS_PASSWORD"
               valueFrom:
                 secretKeyRef:
diff --git a/chart/templates/deployment-web.yaml b/chart/templates/deployment-web.yaml
index 0878aa9b87041ff9f249102c574245a09bebe35a..ab722c77b1cb083001f9cf127c8e843162111c9f 100644
--- a/chart/templates/deployment-web.yaml
+++ b/chart/templates/deployment-web.yaml
@@ -62,7 +62,7 @@ spec:
               valueFrom:
                 secretKeyRef:
                   name: {{ template "mastodon.postgresql.secretName" . }}
-                  key: postgres-password
+                  key: password
             - name: "REDIS_PASSWORD"
               valueFrom:
                 secretKeyRef:
diff --git a/chart/templates/job-assets-precompile.yaml b/chart/templates/job-assets-precompile.yaml
index 37009822e659d077a03cb8fa1c46bf429595ede1..faa51a20d9d7b8c0f6ba7f11ae3da9cca392f415 100644
--- a/chart/templates/job-assets-precompile.yaml
+++ b/chart/templates/job-assets-precompile.yaml
@@ -60,7 +60,7 @@ spec:
               valueFrom:
                 secretKeyRef:
                   name: {{ template "mastodon.postgresql.secretName" . }}
-                  key: postgres-password
+                  key: password
             - name: "REDIS_PASSWORD"
               valueFrom:
                 secretKeyRef:
diff --git a/chart/templates/job-chewy-upgrade.yaml b/chart/templates/job-chewy-upgrade.yaml
index a4bac63abc7953591d43b5a36bfdb4885b726d51..ae6fb38e1296215becbe9d95ace8d2e5dbb8fa14 100644
--- a/chart/templates/job-chewy-upgrade.yaml
+++ b/chart/templates/job-chewy-upgrade.yaml
@@ -61,7 +61,7 @@ spec:
               valueFrom:
                 secretKeyRef:
                   name: {{ template "mastodon.postgresql.secretName" . }}
-                  key: postgres-password
+                  key: password
             - name: "REDIS_PASSWORD"
               valueFrom:
                 secretKeyRef:
diff --git a/chart/templates/job-create-admin.yaml b/chart/templates/job-create-admin.yaml
index c1c0bdaed5968cf4f713c6e612689484144974b1..659c00671fc1e7c81a1ffaf4cbeb41dcdcd84fae 100644
--- a/chart/templates/job-create-admin.yaml
+++ b/chart/templates/job-create-admin.yaml
@@ -66,7 +66,7 @@ spec:
               valueFrom:
                 secretKeyRef:
                   name: {{ template "mastodon.postgresql.secretName" . }}
-                  key: postgres-password
+                  key: password
             - name: "REDIS_PASSWORD"
               valueFrom:
                 secretKeyRef:
diff --git a/chart/templates/job-db-migrate.yaml b/chart/templates/job-db-migrate.yaml
index 848ed36441a5a1b8de8b8f8923f79c7cacbeefda..8e4f70dfb1d03ccbf3ea1259acaaf1f931156e96 100644
--- a/chart/templates/job-db-migrate.yaml
+++ b/chart/templates/job-db-migrate.yaml
@@ -60,7 +60,7 @@ spec:
               valueFrom:
                 secretKeyRef:
                   name: {{ template "mastodon.postgresql.secretName" . }}
-                  key: postgres-password
+                  key: password
             - name: "REDIS_PASSWORD"
               valueFrom:
                 secretKeyRef:
diff --git a/chart/templates/secrets.yaml b/chart/templates/secrets.yaml
index 2a91c349342e39a8b593e38a09dfced87670ce91..d7ac936ce50277a3122ce9aca28a5af724bf0c0e 100644
--- a/chart/templates/secrets.yaml
+++ b/chart/templates/secrets.yaml
@@ -37,7 +37,7 @@ data:
   {{- end }}
   {{- if not .Values.postgresql.enabled }}
   {{- if not .Values.postgresql.auth.existingSecret }}
-  postgres-password: "{{ .Values.postgresql.auth.password | b64enc }}"
+  password: "{{ .Values.postgresql.auth.password | b64enc }}"
   {{- end }}
   {{- end }}
 {{- end -}}
diff --git a/chart/values.yaml b/chart/values.yaml
index dc57d86209d077c1e0873630ccb908cf51d91c11..ef349c0875e440514f93bd4dd015b46c1ed3dda3 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -141,7 +141,7 @@ postgresql:
   # postgresqlHostname: preexisting-postgresql
   auth:
     database: mastodon_production
-    username: postgres
+    username: mastodon
     # you must set a password; the password generated by the postgresql chart will
     # be rotated on each upgrade:
     # https://github.com/bitnami/charts/tree/master/bitnami/postgresql#upgrade
@@ -149,7 +149,7 @@ postgresql:
     # Set same value as above
     postgresPassword: ""
     # you can also specify the name of an existing Secret
-    # with a key of postgres-password set to the password you want
+    # with a key of password set to the password you want
     existingSecret: ""
 
 # https://github.com/bitnami/charts/tree/master/bitnami/redis#parameters