diff --git a/clusters/cl01tl/helm/stalwart/Chart.lock b/clusters/cl01tl/helm/stalwart/Chart.lock
index ac1ce2d5a..22eb6084d 100644
--- a/clusters/cl01tl/helm/stalwart/Chart.lock
+++ b/clusters/cl01tl/helm/stalwart/Chart.lock
@@ -5,8 +5,5 @@ dependencies:
 - name: postgres-cluster
   repository: oci://harbor.alexlebens.net/helm-charts
   version: 6.16.1
-- name: postgres-cluster
-  repository: oci://harbor.alexlebens.net/helm-charts
-  version: 6.16.1
-digest: sha256:c412384487bc67562abb304902d561c8a7fb457f3f805cc81c87a4b836df859e
-generated: "2025-12-14T17:52:30.921214-06:00"
+digest: sha256:1725669256278ec5ab283b4dcfa787ecfb6685443b25a21a876e54be92d4a24f
+generated: "2025-12-14T18:08:46.379884-06:00"
diff --git a/clusters/cl01tl/helm/stalwart/Chart.yaml b/clusters/cl01tl/helm/stalwart/Chart.yaml
index 34b5fdda5..e45a988b3 100644
--- a/clusters/cl01tl/helm/stalwart/Chart.yaml
+++ b/clusters/cl01tl/helm/stalwart/Chart.yaml
@@ -21,10 +21,6 @@ dependencies:
     alias: stalwart
     version: 4.5.0
     repository: https://bjw-s-labs.github.io/helm-charts/
-  - name: postgres-cluster
-    alias: postgres-17-cluster
-    version: 6.16.1
-    repository: oci://harbor.alexlebens.net/helm-charts
   - name: postgres-cluster
     alias: postgres-18-cluster
     version: 6.16.1
diff --git a/clusters/cl01tl/helm/stalwart/templates/external-secret.yaml b/clusters/cl01tl/helm/stalwart/templates/external-secret.yaml
index 22d84d4f1..ebaaa6199 100644
--- a/clusters/cl01tl/helm/stalwart/templates/external-secret.yaml
+++ b/clusters/cl01tl/helm/stalwart/templates/external-secret.yaml
@@ -93,75 +93,6 @@ spec:
         metadataPolicy: None
         property: secret_key
 
----
-apiVersion: external-secrets.io/v1
-kind: ExternalSecret
-metadata:
-  name: stalwart-postgresql-17-cluster-backup-secret
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app.kubernetes.io/name: stalwart-postgresql-17-cluster-backup-secret
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: database
-    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: stalwart-postgresql-17-cluster-backup-secret-garage
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app.kubernetes.io/name: stalwart-postgresql-17-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
-
 ---
 apiVersion: external-secrets.io/v1
 kind: ExternalSecret
diff --git a/clusters/cl01tl/helm/stalwart/values.yaml b/clusters/cl01tl/helm/stalwart/values.yaml
index b43d7c3c5..9ae14752e 100644
--- a/clusters/cl01tl/helm/stalwart/values.yaml
+++ b/clusters/cl01tl/helm/stalwart/values.yaml
@@ -51,65 +51,6 @@ stalwart:
           main:
             - path: /opt/stalwart
               readOnly: false
-postgres-17-cluster:
-  mode: recovery
-  cluster:
-    storage:
-      storageClass: local-path
-    walStorage:
-      storageClass: local-path
-    monitoring:
-      enabled: true
-      prometheusRule:
-        enabled: true
-    resources:
-      requests:
-        cpu: 200m
-  recovery:
-    method: objectStore
-    objectStore:
-      destinationPath: s3://postgres-backups/cl01tl/stalwart/stalwart-postgresql-17-cluster
-      endpointURL: http://garage-main.garage:3900
-      index: 1
-      endpointCredentials: stalwart-postgresql-17-cluster-backup-secret-garage
-  backup:
-    objectStore:
-      - name: external
-        destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/stalwart/stalwart-postgresql-17-cluster
-        index: 1
-        retentionPolicy: "30d"
-        isWALArchiver: false
-      - name: garage-local
-        destinationPath: s3://postgres-backups/cl01tl/stalwart/stalwart-postgresql-17-cluster
-        index: 1
-        endpointURL: http://garage-main.garage:3900
-        endpointCredentials: stalwart-postgresql-17-cluster-backup-secret-garage
-        endpointCredentialsIncludeRegion: true
-        retentionPolicy: "3d"
-        isWALArchiver: true
-      # - name: garage-remote
-      #   destinationPath: s3://postgres-backups/cl01tl/stalwart/stalwart-postgresql-17-cluster
-      #   index: 1
-      #   endpointURL: https://garage-ps10rp.boreal-beaufort.ts.net:3900
-      #   endpointCredentials: stalwart-postgresql-17-cluster-backup-secret-garage
-      #   retentionPolicy: "30d"
-      #   data:
-      #     compression: bzip2
-      #     jobs: 2
-    scheduledBackups:
-      - name: daily-backup
-        suspend: false
-        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
-      #   schedule: "0 0 4 * * SAT"
-      #   backupName: garage-remote
 postgres-18-cluster:
   mode: recovery
   cluster:
@@ -128,25 +69,12 @@ postgres-18-cluster:
       requests:
         cpu: 200m
   recovery:
-    method: import
+    method: objectStore
     objectStore:
       destinationPath: s3://postgres-backups/cl01tl/stalwart/stalwart-postgresql-18-cluster
       endpointURL: http://garage-main.garage:3900
       index: 1
       endpointCredentials: stalwart-postgresql-18-cluster-backup-secret-garage
-    import:
-      type: "microservice"
-      databases:
-        - app
-      source:
-        host: "stalwart-postgresql-17-cluster-rw"
-        port: 5432
-        username: app
-        database: app
-        sslMode: "disable"
-        passwordSecret:
-          name: "stalwart-postgresql-17-cluster-app"
-          key: "password"
   backup:
     objectStore:
       - name: external