diff --git a/wildduck/application.yml b/wildduck/webmail.yaml
similarity index 93%
rename from wildduck/application.yml
rename to wildduck/webmail.yaml
index 58a52ca..7aa21d5 100644
--- a/wildduck/application.yml
+++ b/wildduck/webmail.yaml
@@ -1,4 +1,12 @@
 ---
+apiVersion: codemowers.cloud/v1beta1
+kind: RedisClaim
+metadata:
+  name: webmail
+spec:
+  class: ephemeral
+  capacity: 100Mi
+---
 apiVersion: codemowers.io/v1alpha1
 kind: OIDCGWMiddlewareClient
 metadata:
@@ -86,8 +94,8 @@ spec:
             - name: APPCONF_dbs_redis
               valueFrom:
                 secretKeyRef:
-                  name: redis-secrets
-                  key: REDIS_URI
+                  name: redis-webmail-owner-secrets
+                  key: REDIS_MASTER_0_URI
       volumes:
         - name: webmail-config
           projected:
@@ -134,10 +142,3 @@ spec:
   tls:
   - hosts:
     - "*.k-space.ee"
----
-apiVersion: codemowers.io/v1alpha1
-kind: KeyDBCluster
-metadata:
-  name: redis
-spec:
-  replicas: 3