diff --git a/apps/base/mastodon/kustomization.yaml b/apps/base/mastodon/kustomization.yaml
index dfc9a0133e843e7543eb42935f6ea7b8eafca6ea..fcf94b977a259f00616682227277039fb97eceb1 100644
--- a/apps/base/mastodon/kustomization.yaml
+++ b/apps/base/mastodon/kustomization.yaml
@@ -13,5 +13,8 @@ resources:
   - ../../../shared/networkpolicies/allow-from-database.yaml
   - ../../../shared/networkpolicies/allow-from-monitoring.yaml
   - ../../../shared/networkpolicies/allow-from-redis.yaml
-patchesStrategicMerge:
-  - networkpolicy.yaml
+patches:
+  - path: networkpolicy.yaml
+
+components:
+  - ../../../shared/components/keydb
diff --git a/apps/base/mastodon/redis.yaml b/apps/base/mastodon/redis.yaml
deleted file mode 100644
index 2a5f07066f2a14542c5766b2b92cc067eb92c68e..0000000000000000000000000000000000000000
--- a/apps/base/mastodon/redis.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-apiVersion: databases.spotahome.com/v1
-kind: RedisFailover
-metadata:
-  labels:
-      app.kubernetes.io/name: mastodon
-  name: mastodon-redis
-  namespace: mastodon
-spec:
-  sentinel:
-    replicas: 3
-    resources:
-      requests:
-        cpu: 100m
-        memory: 128Mi
-      limits:
-        cpu: 200m
-        memory: 256Mi
-  redis:
-    replicas: 3
-    resources:
-      requests:
-        memory: 128Mi
-        cpu: 100m
-      limits:
-        memory: 256Mi
-        cpu: 200m
----
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    app.kubernetes.io/name: mastodon
-  name: mastodon-redis-master
-  namespace: mastodon
-spec:
-  ports:
-  - name: redis
-    port: 6379
-    protocol: TCP
-    targetPort: 6379
-  selector:
-    app.kubernetes.io/name: mastodon-redis
-    redisfailovers-role: master
\ No newline at end of file
diff --git a/apps/base/mastodon/release.yaml b/apps/base/mastodon/release.yaml
index 52693e1af60bf88649dca14e072b5e7c3b364c00..5d15b6a106cf088a8dbd5d9304e2eaf265ed2021 100644
--- a/apps/base/mastodon/release.yaml
+++ b/apps/base/mastodon/release.yaml
@@ -161,6 +161,6 @@ data:
       enabled: false
     redis:
       enabled: false
-      redisUrl: redis://mastodon-redis-master:6379
+      redisUrl: redis://keydb:6379
       auth:
         enabled: false