diff --git a/clusters/cl01tl/manifests/lidarr/Cluster-lidarr-postgresql-18-cluster.yaml b/clusters/cl01tl/manifests/lidarr/Cluster-lidarr-postgresql-18-cluster.yaml
index 92f0da2b3..11fee2713 100644
--- a/clusters/cl01tl/manifests/lidarr/Cluster-lidarr-postgresql-18-cluster.yaml
+++ b/clusters/cl01tl/manifests/lidarr/Cluster-lidarr-postgresql-18-cluster.yaml
@@ -29,13 +29,6 @@ spec:
       parameters:
         barmanObjectName: "lidarr-postgresql-18-garage-local-backup"
         serverName: "lidarr-postgresql-18-backup-1"
-  externalClusters:
-    - name: recovery
-      plugin:
-        name: barman-cloud.cloudnative-pg.io
-        parameters:
-          barmanObjectName: "lidarr-postgresql-18-recovery"
-          serverName: lidarr-postgresql-18-backup-1
   storage:
     size: 10Gi
     storageClass: local-path
@@ -61,22 +54,30 @@ spec:
       hot_standby_feedback: "on"
       max_slot_wal_keep_size: 2000MB
       shared_buffers: 128MB
-  managed:
-    roles:
-      - app
   monitoring:
     enablePodMonitor: true
     disableDefaultQueries: false
   bootstrap:
-    recovery:
-      database: app
-      source: lidarr-postgresql-18-backup-1
+    initdb:
+      owner: app
+      import:
+        source:
+          externalCluster: importSource
+        type: monolith
+        databases:
+          - lidarr-main
+          - lidarr-log
+        roles:
+          - app
+        schemaOnly: false
   externalClusters:
-    - name: lidarr-postgresql-18-backup-1
-      plugin:
-        name: barman-cloud.cloudnative-pg.io
-        enabled: true
-        isWALArchiver: false
-        parameters:
-          barmanObjectName: "lidarr-postgresql-18-recovery"
-          serverName: lidarr-postgresql-18-backup-1
+    - name: importSource
+      connectionParameters:
+        host: "lidarr2-postgresql-17-cluster-rw"
+        port: "5432"
+        user: "app"
+        dbname: "app"
+        sslmode: "disable"
+      password:
+        name: lidarr2-postgresql-17-cluster-app
+        key: password
diff --git a/clusters/cl01tl/manifests/lidarr/ObjectStore-lidarr-postgresql-18-recovery.yaml b/clusters/cl01tl/manifests/lidarr/ObjectStore-lidarr-postgresql-18-recovery.yaml
deleted file mode 100644
index 25ab2215d..000000000
--- a/clusters/cl01tl/manifests/lidarr/ObjectStore-lidarr-postgresql-18-recovery.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-apiVersion: barmancloud.cnpg.io/v1
-kind: ObjectStore
-metadata:
-  name: "lidarr-postgresql-18-recovery"
-  namespace: lidarr
-  labels:
-    helm.sh/chart: postgres-18-cluster-6.17.1
-    app.kubernetes.io/name: lidarr-postgresql-18
-    app.kubernetes.io/instance: lidarr
-    app.kubernetes.io/part-of: lidarr
-    app.kubernetes.io/version: "6.17.1"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  configuration:
-    destinationPath: s3://postgres-backups/cl01tl/lidarr/lidarr-postgresql-18-cluster
-    endpointURL: http://garage-main.garage:3900
-    wal:
-      compression: snappy
-      maxParallel: 1
-    data:
-      compression: snappy
-      jobs: 1
-    s3Credentials:
-      accessKeyId:
-        name: lidarr-postgresql-18-cluster-backup-secret
-        key: ACCESS_KEY_ID
-      secretAccessKey:
-        name: lidarr-postgresql-18-cluster-backup-secret
-        key: ACCESS_SECRET_KEY