diff --git a/charts/matrix-media-repo/Chart.yaml b/charts/matrix-media-repo/Chart.yaml
index 8bfdfa0..8193594 100644
--- a/charts/matrix-media-repo/Chart.yaml
+++ b/charts/matrix-media-repo/Chart.yaml
@@ -5,17 +5,17 @@ description: Matrix media repository with multi-domain in mind.
 appVersion: 1.2.12
 
 type: application
-version: 1.1.1
+version: 2.0.0
 maintainers:
   - name: Alexander Olofsson
     email: ace@haxalot.com
 
 dependencies:
   - name: postgresql
-    version: ^10.9.4
+    version: ^12.1.4
     repository: https://charts.bitnami.com/bitnami
     condition: postgresql.enabled
   - name: redis
-    version: ^15.7.0
+    version: ^17.3.17
     repository: https://charts.bitnami.com/bitnami
     condition: redis.enabled
diff --git a/charts/matrix-media-repo/templates/_helpers.tpl b/charts/matrix-media-repo/templates/_helpers.tpl
index c427ee3..9e70321 100644
--- a/charts/matrix-media-repo/templates/_helpers.tpl
+++ b/charts/matrix-media-repo/templates/_helpers.tpl
@@ -116,7 +116,10 @@ Set postgresql username
 */}}
 {{- define "matrix-media-repo.postgresql.username" -}}
 {{- if .Values.postgresql.enabled -}}
-{{- .Values.postgresql.postgresqlUsername | default "postgres" }}
+{{-  if .Values.postgresql.postgresqlUsername -}}
+{{-    fail "You need to switch to the new postgresql.auth values." -}}
+{{-  end -}}
+{{- .Values.postgresql.auth.username | default "postgres" }}
 {{- else -}}
 {{ required "A valid externalPostgresql.username is required" .Values.externalPostgresql.username }}
 {{- end -}}
@@ -127,7 +130,10 @@ Set postgresql password
 */}}
 {{- define "matrix-media-repo.postgresql.password" -}}
 {{- if .Values.postgresql.enabled -}}
-{{- .Values.postgresql.postgresqlPassword | default "" }}
+{{-  if .Values.postgresql.postgresqlPassword -}}
+{{-    fail "You need to switch to the new postgresql.auth values." -}}
+{{-  end -}}
+{{- .Values.postgresql.auth.password | default "" }}
 {{- else -}}
 {{ required "A valid externalPostgresql.password is required" .Values.externalPostgresql.password }}
 {{- end -}}
@@ -138,7 +144,10 @@ Set postgresql database
 */}}
 {{- define "matrix-media-repo.postgresql.database" -}}
 {{- if .Values.postgresql.enabled -}}
-{{- .Values.postgresql.postgresqlDatabase | default "synapse" }}
+{{-  if .Values.postgresql.postgresqlDatabase -}}
+{{-    fail "You need to switch to the new postgresql.auth values." -}}
+{{-  end -}}
+{{- .Values.postgresql.auth.database | default "synapse" }}
 {{- else -}}
 {{ required "A valid externalPostgresql.database is required" .Values.externalPostgresql.database }}
 {{- end -}}
diff --git a/charts/matrix-media-repo/values.yaml b/charts/matrix-media-repo/values.yaml
index 93ac970..9fc3823 100644
--- a/charts/matrix-media-repo/values.yaml
+++ b/charts/matrix-media-repo/values.yaml
@@ -88,8 +88,9 @@ persistence:
 postgresql:
   enabled: true
 
-  postgresqlUsername: matrix_media_repo
-  postgresqlDatabase: matrix_media_repo
+  auth:
+    username: matrix_media_repo
+    database: matrix_media_repo
 
   persistence:
     size: 16G