diff --git a/clusters/cl01tl/applications/radarr-anime/values.yaml b/clusters/cl01tl/applications/radarr-anime/values.yaml
index a6edc591d..c7c369d23 100644
--- a/clusters/cl01tl/applications/radarr-anime/values.yaml
+++ b/clusters/cl01tl/applications/radarr-anime/values.yaml
@@ -93,7 +93,6 @@ postgres-17-cluster:
       enabled: true
       prometheusRule:
         enabled: true
-  bootstrap:
     initdb:
       postInitSQL:
         - CREATE DATABASE "radarr-main" OWNER "app";
diff --git a/clusters/cl01tl/applications/radarr-standup/values.yaml b/clusters/cl01tl/applications/radarr-standup/values.yaml
index 9c44854ef..76b38dda3 100644
--- a/clusters/cl01tl/applications/radarr-standup/values.yaml
+++ b/clusters/cl01tl/applications/radarr-standup/values.yaml
@@ -93,7 +93,6 @@ postgres-17-cluster:
       enabled: true
       prometheusRule:
         enabled: true
-  bootstrap:
     initdb:
       postInitSQL:
         - CREATE DATABASE "radarr-main" OWNER "app";
diff --git a/clusters/cl01tl/applications/sonarr-4k/Chart.yaml b/clusters/cl01tl/applications/sonarr-4k/Chart.yaml
index de5379f84..12df9f542 100644
--- a/clusters/cl01tl/applications/sonarr-4k/Chart.yaml
+++ b/clusters/cl01tl/applications/sonarr-4k/Chart.yaml
@@ -27,7 +27,7 @@ dependencies:
     version: 4.3.0
   - name: postgres-cluster
     alias: postgres-17-cluster
-    version: 5.1.0
+    version: 6.5.0
     repository: oci://harbor.alexlebens.net/helm-charts
 icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/sonarr.png
 appVersion: 4.0.14
diff --git a/clusters/cl01tl/applications/sonarr-4k/values.yaml b/clusters/cl01tl/applications/sonarr-4k/values.yaml
index 829a6c357..3c8410929 100644
--- a/clusters/cl01tl/applications/sonarr-4k/values.yaml
+++ b/clusters/cl01tl/applications/sonarr-4k/values.yaml
@@ -83,25 +83,37 @@ sonarr-4k:
               readOnly: false
 postgres-17-cluster:
   nameOverride: sonarr4-4k-postgresql-17
-  mode: standalone
+  mode: recovery
   cluster:
-    walStorage:
-      storageClass: local-path
     storage:
       storageClass: local-path
+    walStorage:
+      storageClass: local-path
+    resources:
+      requests:
+        memory: 512Mi
     monitoring:
       enabled: true
-  bootstrap:
+      prometheusRule:
+        enabled: true
     initdb:
-      database: app
-      owner: app
       postInitSQL:
         - CREATE DATABASE "sonarr-main" OWNER "app";
         - CREATE DATABASE "sonarr-log" OWNER "app";
+  recovery:
+    method: objectStore
+    objectStore:
+      destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/sonarr4-4k/sonarr4-4k-postgresql-17-cluster
+      index: 3
   backup:
     enabled: true
-    endpointURL: https://nyc3.digitaloceanspaces.com
-    destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/sonarr4-4k/sonarr4-4k-postgresql-17-cluster
-    endpointCredentials: sonarr-4k-postgresql-17-cluster-backup-secret
-    backupIndex: 3
-    retentionPolicy: "3d"
+    method: objectStore
+    objectStore:
+      - name: external
+        destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/sonarr4-4k/sonarr4-4k-postgresql-17-cluster
+        index: 3
+        retentionPolicy: "3d"
+    scheduledBackups:
+      - name: daily-backup
+        schedule: "0 0 0 * * *"
+        backupName: external
diff --git a/clusters/cl01tl/applications/sonarr-anime/Chart.yaml b/clusters/cl01tl/applications/sonarr-anime/Chart.yaml
index e0e535c0b..21dbc5676 100644
--- a/clusters/cl01tl/applications/sonarr-anime/Chart.yaml
+++ b/clusters/cl01tl/applications/sonarr-anime/Chart.yaml
@@ -26,7 +26,7 @@ dependencies:
     version: 4.3.0
   - name: postgres-cluster
     alias: postgres-17-cluster
-    version: 5.1.0
+    version: 6.5.0
     repository: oci://harbor.alexlebens.net/helm-charts
 icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/sonarr.png
 appVersion: 4.0.14
diff --git a/clusters/cl01tl/applications/sonarr-anime/values.yaml b/clusters/cl01tl/applications/sonarr-anime/values.yaml
index f2f1473e1..801fe294f 100644
--- a/clusters/cl01tl/applications/sonarr-anime/values.yaml
+++ b/clusters/cl01tl/applications/sonarr-anime/values.yaml
@@ -83,34 +83,37 @@ sonarr-anime:
               readOnly: false
 postgres-17-cluster:
   nameOverride: sonarr4-anime-postgresql-17
-  mode: standalone
+  mode: recovery
   cluster:
     storage:
       storageClass: local-path
     walStorage:
       storageClass: local-path
+    resources:
+      requests:
+        memory: 512Mi
     monitoring:
       enabled: true
       prometheusRule:
         enabled: true
-  bootstrap:
     initdb:
-      database: app
-      owner: app
       postInitSQL:
         - CREATE DATABASE "sonarr-main" OWNER "app";
         - CREATE DATABASE "sonarr-log" OWNER "app";
   recovery:
     method: objectStore
     objectStore:
-      endpointURL: https://nyc3.digitaloceanspaces.com
       destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/sonarr4-anime/sonarr4-anime-postgresql-17-cluster
-      endpointCredentials: sonarr-anime-postgresql-17-cluster-backup-secret
-      recoveryIndex: 3
+      index: 3
   backup:
     enabled: true
-    endpointURL: https://nyc3.digitaloceanspaces.com
-    destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/sonarr4-anime/sonarr4-anime-postgresql-17-cluster
-    endpointCredentials: sonarr-anime-postgresql-17-cluster-backup-secret
-    backupIndex: 3
-    retentionPolicy: "3d"
+    method: objectStore
+    objectStore:
+      - name: external
+        destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/sonarr4-anime/sonarr4-anime-postgresql-17-cluster
+        index: 3
+        retentionPolicy: "3d"
+    scheduledBackups:
+      - name: daily-backup
+        schedule: "0 0 0 * * *"
+        backupName: external
diff --git a/clusters/cl01tl/applications/sonarr/Chart.yaml b/clusters/cl01tl/applications/sonarr/Chart.yaml
index 2e6bd0111..69ddf3bd5 100644
--- a/clusters/cl01tl/applications/sonarr/Chart.yaml
+++ b/clusters/cl01tl/applications/sonarr/Chart.yaml
@@ -26,7 +26,7 @@ dependencies:
     version: 4.3.0
   - name: postgres-cluster
     alias: postgres-17-cluster
-    version: 5.1.0
+    version: 6.5.0
     repository: oci://harbor.alexlebens.net/helm-charts
 icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/sonarr.png
 appVersion: 4.0.14
diff --git a/clusters/cl01tl/applications/sonarr/values.yaml b/clusters/cl01tl/applications/sonarr/values.yaml
index e4b67722e..dd6fefc1d 100644
--- a/clusters/cl01tl/applications/sonarr/values.yaml
+++ b/clusters/cl01tl/applications/sonarr/values.yaml
@@ -83,7 +83,7 @@ sonarr:
               readOnly: false
 postgres-17-cluster:
   nameOverride: sonarr4-postgresql-17
-  mode: standalone
+  mode: recovery
   cluster:
     storage:
       storageClass: local-path
@@ -96,24 +96,24 @@ postgres-17-cluster:
       enabled: true
       prometheusRule:
         enabled: true
-  bootstrap:
     initdb:
-      database: app
-      owner: app
       postInitSQL:
         - CREATE DATABASE "sonarr-main" OWNER "app";
         - CREATE DATABASE "sonarr-log" OWNER "app";
   recovery:
     method: objectStore
     objectStore:
-      endpointURL: https://nyc3.digitaloceanspaces.com
       destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/sonarr4/sonarr4-postgresql-17-cluster
-      endpointCredentials: sonarr-postgresql-17-cluster-backup-secret
-      recoveryIndex: 3
+      index: 3
   backup:
     enabled: true
-    endpointURL: https://nyc3.digitaloceanspaces.com
-    destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/sonarr4/sonarr4-postgresql-17-cluster
-    endpointCredentials: sonarr-postgresql-17-cluster-backup-secret
-    backupIndex: 3
-    retentionPolicy: "3d"
+    method: objectStore
+    objectStore:
+      - name: external
+        destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/sonarr4/sonarr4-postgresql-17-cluster
+        index: 3
+        retentionPolicy: "3d"
+    scheduledBackups:
+      - name: daily-backup
+        schedule: "0 0 0 * * *"
+        backupName: external