diff --git a/mailu/templates/configmap-global.yaml b/mailu/templates/configmap-global.yaml
index 76ba6e94ab6d993b0a1e010de06e94ad38dc5abd..b4cf80a0c1ffc3e356ffe7cbe44534310e87d98d 100644
--- a/mailu/templates/configmap-global.yaml
+++ b/mailu/templates/configmap-global.yaml
@@ -23,8 +23,8 @@ data:
   PASSWORD_SCHEME: "{{ .Values.config.passwordScheme }}"
   POD_ADDRESS_RANGE: "{{ .Values.config.realIpFrom }}"
   POSTMASTER: "{{ .Values.config.postmaster }}"
-  QUOTA_STORAGE_URL: "redis://{{ .Values.redis.host }}/1"
-  RATELIMIT_STORAGE_URL: "redis://{{ .Values.redis.host }}/2"
+  QUOTA_STORAGE_URL: "redis://{{ .Values.redis.host }}/{{ .Values.redis.databases.quota }}"
+  RATELIMIT_STORAGE_URL: "redis://{{ .Values.redis.host }}/{{ .Values.redis.databases.ratelimit }}"
   REAL_IP_FROM: "{{ .Values.config.realIpFrom }}"
   REAL_IP_HEADER: "{{ .Values.config.realIpHeader }}"
   RECIPIENT_DELIMITER: "{{ .Values.config.recipientDelimiter }}"
diff --git a/mailu/values.yaml b/mailu/values.yaml
index 683df70eb95334005af38bb953a33f01adacb35f..4d815dc106bf4441cc58a5c7830f17f922180b5e 100644
--- a/mailu/values.yaml
+++ b/mailu/values.yaml
@@ -44,6 +44,9 @@ database:
 
 redis:
   host: "external-redis-hostname"
+  databases:
+    quota: 1
+    ratelimit: 2
 
 certificate:
   issuer: "letsencrypt"
diff --git a/oauth2-proxy/templates/deployment.yaml b/oauth2-proxy/templates/deployment.yaml
index 3177d8513a62275137ea231bc777d782cf444777..13d67cbd78567c4d56d7ab80a1f4fbc86eb27b1e 100644
--- a/oauth2-proxy/templates/deployment.yaml
+++ b/oauth2-proxy/templates/deployment.yaml
@@ -57,7 +57,7 @@ spec:
             - "--http-address=0.0.0.0:4180"
             - "--provider=oidc"
             {{ if .Values.redis.enabled }}
-            - "--redis-connection-url={{ .Values.redis.url }}"
+            - "--redis-connection-url=redis://{{ .Values.redis.host }}/{{ .Values.redis.database }}"
             {{ if .Values.redis.password ne "" }}
             - "--redis-password={{ .Values.redis.password }}"
             {{ end }}
diff --git a/oauth2-proxy/values.yaml b/oauth2-proxy/values.yaml
index 023f24bb80a9aac072a308dd79d500d4d575a88f..7a239172b59620fe48d300ac2db98b81c9fd4e4d 100644
--- a/oauth2-proxy/values.yaml
+++ b/oauth2-proxy/values.yaml
@@ -22,8 +22,9 @@ cookieSecret: ""
 
 redis:
   enabled: false
-  url: "example.com"
+  host: "example.com"
   password: ""
+  database: 0
 
 service:
   type: ClusterIP