diff --git a/clusters/cl01tl/helm/sonarr-anime/Chart.lock b/clusters/cl01tl/helm/sonarr-anime/Chart.lock
index 507cecfad..ce89da3ce 100644
--- a/clusters/cl01tl/helm/sonarr-anime/Chart.lock
+++ b/clusters/cl01tl/helm/sonarr-anime/Chart.lock
@@ -4,6 +4,9 @@ dependencies:
   version: 4.5.0
 - name: postgres-cluster
   repository: oci://harbor.alexlebens.net/helm-charts
-  version: 6.16.1
-digest: sha256:17e720887111d7060949e660563b57ce66f389f337dc15827cb6f40b87db0460
-generated: "2025-12-05T17:13:27.899279523Z"
+  version: 6.17.1
+- name: postgres-cluster
+  repository: oci://harbor.alexlebens.net/helm-charts
+  version: 6.17.1
+digest: sha256:f73b2549ec65cc87a5a0e5f0adcc0d5699e1f916fc758e99b85ef1a80c0f92cb
+generated: "2025-12-14T17:38:12.781338-06:00"
diff --git a/clusters/cl01tl/helm/sonarr-anime/Chart.yaml b/clusters/cl01tl/helm/sonarr-anime/Chart.yaml
index b8851a832..50687563b 100644
--- a/clusters/cl01tl/helm/sonarr-anime/Chart.yaml
+++ b/clusters/cl01tl/helm/sonarr-anime/Chart.yaml
@@ -26,7 +26,11 @@ dependencies:
     version: 4.5.0
   - name: postgres-cluster
     alias: postgres-17-cluster
-    version: 6.16.1
+    version: 6.17.1
+    repository: oci://harbor.alexlebens.net/helm-charts
+  - name: postgres-cluster
+    alias: postgres-18-cluster
+    version: 6.17.1
     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/helm/sonarr-anime/templates/external-secret.yaml b/clusters/cl01tl/helm/sonarr-anime/templates/external-secret.yaml
index 781cce519..5a0d0e128 100644
--- a/clusters/cl01tl/helm/sonarr-anime/templates/external-secret.yaml
+++ b/clusters/cl01tl/helm/sonarr-anime/templates/external-secret.yaml
@@ -120,3 +120,70 @@ spec:
         key: /garage/home-infra/postgres-backups
         metadataPolicy: None
         property: ACCESS_REGION
+
+---
+apiVersion: external-secrets.io/v1
+kind: ExternalSecret
+metadata:
+  name: sonarr-anime-postgresql-18-cluster-backup-secret
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: sonarr-anime-postgresql-18-cluster-backup-secret
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/part-of: {{ .Release.Name }}
+spec:
+  secretStoreRef:
+    kind: ClusterSecretStore
+    name: vault
+  data:
+    - secretKey: ACCESS_KEY_ID
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /digital-ocean/home-infra/postgres-backups
+        metadataPolicy: None
+        property: access
+    - secretKey: ACCESS_SECRET_KEY
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /digital-ocean/home-infra/postgres-backups
+        metadataPolicy: None
+        property: secret
+
+---
+apiVersion: external-secrets.io/v1
+kind: ExternalSecret
+metadata:
+  name: sonarr-anime-postgresql-18-cluster-backup-secret-garage
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: sonarr-anime-postgresql-18-cluster-backup-secret-garage
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/part-of: {{ .Release.Name }}
+spec:
+  secretStoreRef:
+    kind: ClusterSecretStore
+    name: vault
+  data:
+    - secretKey: ACCESS_KEY_ID
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /garage/home-infra/postgres-backups
+        metadataPolicy: None
+        property: ACCESS_KEY_ID
+    - secretKey: ACCESS_SECRET_KEY
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /garage/home-infra/postgres-backups
+        metadataPolicy: None
+        property: ACCESS_SECRET_KEY
+    - secretKey: ACCESS_REGION
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /garage/home-infra/postgres-backups
+        metadataPolicy: None
+        property: ACCESS_REGION
diff --git a/clusters/cl01tl/helm/sonarr-anime/values.yaml b/clusters/cl01tl/helm/sonarr-anime/values.yaml
index 5f4939f8e..86301d13c 100644
--- a/clusters/cl01tl/helm/sonarr-anime/values.yaml
+++ b/clusters/cl01tl/helm/sonarr-anime/values.yaml
@@ -85,6 +85,7 @@ postgres-17-cluster:
   nameOverride: sonarr4-anime-postgresql-17
   mode: recovery
   cluster:
+    enableSuperuserAccess: false
     storage:
       storageClass: local-path
     walStorage:
@@ -146,3 +147,90 @@ postgres-17-cluster:
       #   suspend: false
       #   schedule: "0 30 4 * * SAT"
       #   backupName: garage-remote
+postgres-18-cluster:
+  mode: recovery
+  cluster:
+    image:
+      repository: ghcr.io/cloudnative-pg/postgresql
+      tag: 18.1-standard-trixie
+    storage:
+      storageClass: local-path
+    walStorage:
+      storageClass: local-path
+    resources:
+      requests:
+        memory: 512Mi
+    monitoring:
+      enabled: true
+      prometheusRule:
+        enabled: true
+    initdb:
+      database: app
+      owner: app
+    #   postInitSQL:
+    #     - CREATE DATABASE "sonarr-main" OWNER "app";
+    #     - CREATE DATABASE "sonarr-log" OWNER "app";
+  recovery:
+    method: import
+    objectStore:
+      destinationPath: s3://postgres-backups/cl01tl/sonarr-anime/sonarr-anime-postgresql-18-cluster
+      endpointURL: http://garage-main.garage:3900
+      index: 1
+      endpointCredentials: sonarr-anime-postgresql-18-cluster-backup-secret-garage
+    import:
+      type: "monolith"
+      databases:
+        - sonarr-main
+        - sonarr-log
+      roles:
+        - app
+      source:
+        host: "sonarr4-anime-postgresql-17-cluster-rw"
+        port: 5432
+        username: postgres
+        database: "*"
+        sslMode: "disable"
+        passwordSecret:
+          name: "sonarr4-anime-postgresql-17-cluster-superuser"
+          key: "password"
+  backup:
+    objectStore:
+      - name: external
+        destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/sonarr-anime/sonarr-anime-postgresql-18-cluster
+        index: 1
+        endpointCredentials: sonarr-anime-postgresql-18-cluster-backup-secret
+        retentionPolicy: "30d"
+        isWALArchiver: false
+      - name: garage-local
+        destinationPath: s3://postgres-backups/cl01tl/sonarr-anime/sonarr-anime-postgresql-18-cluster
+        index: 1
+        endpointURL: http://garage-main.garage:3900
+        endpointCredentials: sonarr-anime-postgresql-18-cluster-backup-secret-garage
+        endpointCredentialsIncludeRegion: true
+        retentionPolicy: "3d"
+        isWALArchiver: true
+    #   - name: garage-remote
+    #     destinationPath: s3://postgres-backups/cl01tl/sonarr-anime/sonarr-anime-postgresql-18-cluster
+    #     index: 1
+    #     endpointURL: https://garage-ps10rp.boreal-beaufort.ts.net:3900
+    #     endpointCredentials: sonarr-anime-postgresql-18-cluster-backup-secret-garage
+    #     retentionPolicy: "30d"
+    #     data:
+    #       compression: bzip2
+    #       jobs: 2
+    scheduledBackups:
+      - name: daily-backup
+        suspend: false
+        immediate: true
+        schedule: "0 0 0 * * *"
+        backupName: external
+      - name: live-backup
+        suspend: false
+        immediate: true
+        schedule: "0 0 0 * * *"
+        backupName: garage-local
+      # - name: weekly-backup
+      #   suspend: false
+      #   immediate: true
+      #   schedule: "0 30 4 * * SAT"
+      #   backupName: garage-remote