diff --git a/charts/matrix-media-repo/Chart.yaml b/charts/matrix-media-repo/Chart.yaml
index aca8c4b..4063e2d 100644
--- a/charts/matrix-media-repo/Chart.yaml
+++ b/charts/matrix-media-repo/Chart.yaml
@@ -5,7 +5,7 @@ description: Matrix media repository with multi-domain in mind.
 appVersion: 1.2.0
 
 type: application
-version: 0.1.0
+version: 0.1.1
 maintainers:
   - name: Alexander Olofsson
     email: ace@haxalot.com
diff --git a/charts/matrix-media-repo/templates/configuration.yaml b/charts/matrix-media-repo/templates/configuration.yaml
index abbd221..0d07511 100644
--- a/charts/matrix-media-repo/templates/configuration.yaml
+++ b/charts/matrix-media-repo/templates/configuration.yaml
@@ -10,6 +10,9 @@ data:
       bindAddress: '0.0.0.0'
       port: 8000
       logDirectory: '-'
+    {{- with .Values.extraRepo }}
+      {{- . | toYaml | nindent 6 }}
+    {{- end }}
 
     metrics:
       enabled: true
diff --git a/charts/matrix-media-repo/values.yaml b/charts/matrix-media-repo/values.yaml
index 54034d3..e73e69b 100644
--- a/charts/matrix-media-repo/values.yaml
+++ b/charts/matrix-media-repo/values.yaml
@@ -40,6 +40,11 @@ config:
 #   MSC2448:
 #     enabled: true
 
+## For setting extra parameters on the repo block
+##
+extraRepo: {}
+#  useForwardedHost: false
+
 ## Per-domain configuration
 ## Ref: https://github.com/turt2live/matrix-media-repo/blob/master/docs/config.md
 ##
@@ -70,8 +75,8 @@ persistence:
 postgresql:
   enabled: true
 
-  postgresqlUsername: matrix-media-repo
-  postgresqlDatabase: matrix-media-repo
+  postgresqlUsername: matrix_media_repo
+  postgresqlDatabase: matrix_media_repo
 
   persistence:
     size: 16G
@@ -81,9 +86,9 @@ postgresql:
 externalPostgresql:
   # host: postgres
   port: 5432
-  username: matrix-media-repo
-  # password: matrix-media-repo
-  database: matrix-media-repo
+  username: matrix_media_repo
+  # password:
+  database: matrix_media_repo
   # sslMode: require
 
 serviceAccount: