diff --git a/clusters/cl01tl/manifests/freshrss/Cluster-freshrss-postgresql-18-cluster.yaml b/clusters/cl01tl/manifests/freshrss/Cluster-freshrss-postgresql-18-cluster.yaml
index 23d493871..114f12778 100644
--- a/clusters/cl01tl/manifests/freshrss/Cluster-freshrss-postgresql-18-cluster.yaml
+++ b/clusters/cl01tl/manifests/freshrss/Cluster-freshrss-postgresql-18-cluster.yaml
@@ -29,6 +29,13 @@ spec:
       parameters:
         barmanObjectName: "freshrss-postgresql-18-garage-local-backup"
         serverName: "freshrss-postgresql-18-backup-1"
+  externalClusters:
+    - name: recovery
+      plugin:
+        name: barman-cloud.cloudnative-pg.io
+        parameters:
+          barmanObjectName: "freshrss-postgresql-18-recovery"
+          serverName: freshrss-postgresql-18-backup-1
   storage:
     size: 10Gi
     storageClass: local-path
@@ -58,22 +65,15 @@ spec:
     enablePodMonitor: true
     disableDefaultQueries: false
   bootstrap:
-    initdb:
-      import:
-        source:
-          externalCluster: importSource
-        type: microservice
-        databases:
-          - app
-        schemaOnly: false
+    recovery:
+      database: app
+      source: freshrss-postgresql-18-backup-1
   externalClusters:
-    - name: importSource
-      connectionParameters:
-        host: "freshrss-postgresql-17-cluster-rw"
-        port: "5432"
-        user: "app"
-        dbname: "app"
-        sslmode: "disable"
-      password:
-        name: freshrss-postgresql-17-cluster-app
-        key: password
+    - name: freshrss-postgresql-18-backup-1
+      plugin:
+        name: barman-cloud.cloudnative-pg.io
+        enabled: true
+        isWALArchiver: false
+        parameters:
+          barmanObjectName: "freshrss-postgresql-18-recovery"
+          serverName: freshrss-postgresql-18-backup-1
diff --git a/clusters/cl01tl/manifests/freshrss/Deployment-freshrss.yaml b/clusters/cl01tl/manifests/freshrss/Deployment-freshrss.yaml
index 3e35c9748..522da4fdb 100644
--- a/clusters/cl01tl/manifests/freshrss/Deployment-freshrss.yaml
+++ b/clusters/cl01tl/manifests/freshrss/Deployment-freshrss.yaml
@@ -125,22 +125,22 @@ spec:
               valueFrom:
                 secretKeyRef:
                   key: host
-                  name: freshrss-postgresql-17-cluster-app
+                  name: freshrss-postgresql-18-cluster-app
             - name: DB_BASE
               valueFrom:
                 secretKeyRef:
                   key: dbname
-                  name: freshrss-postgresql-17-cluster-app
+                  name: freshrss-postgresql-18-cluster-app
             - name: DB_USER
               valueFrom:
                 secretKeyRef:
                   key: user
-                  name: freshrss-postgresql-17-cluster-app
+                  name: freshrss-postgresql-18-cluster-app
             - name: DB_PASSWORD
               valueFrom:
                 secretKeyRef:
                   key: password
-                  name: freshrss-postgresql-17-cluster-app
+                  name: freshrss-postgresql-18-cluster-app
             - name: FRESHRSS_INSTALL
               value: |
                 --api-enabled
diff --git a/clusters/cl01tl/manifests/freshrss/ObjectStore-freshrss-postgresql-18-recovery.yaml b/clusters/cl01tl/manifests/freshrss/ObjectStore-freshrss-postgresql-18-recovery.yaml
new file mode 100644
index 000000000..fc0b9950c
--- /dev/null
+++ b/clusters/cl01tl/manifests/freshrss/ObjectStore-freshrss-postgresql-18-recovery.yaml
@@ -0,0 +1,29 @@
+apiVersion: barmancloud.cnpg.io/v1
+kind: ObjectStore
+metadata:
+  name: "freshrss-postgresql-18-recovery"
+  namespace: freshrss
+  labels:
+    helm.sh/chart: postgres-18-cluster-6.16.1
+    app.kubernetes.io/name: freshrss-postgresql-18
+    app.kubernetes.io/instance: freshrss
+    app.kubernetes.io/part-of: freshrss
+    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/managed-by: Helm
+spec:
+  configuration:
+    destinationPath: s3://postgres-backups/cl01tl/freshrss/freshrss-postgresql-18-cluster
+    endpointURL: http://garage-main.garage:3900
+    wal:
+      compression: snappy
+      maxParallel: 1
+    data:
+      compression: snappy
+      jobs: 1
+    s3Credentials:
+      accessKeyId:
+        name: freshrss-postgresql-18-cluster-backup-secret-garage
+        key: ACCESS_KEY_ID
+      secretAccessKey:
+        name: freshrss-postgresql-18-cluster-backup-secret-garage
+        key: ACCESS_SECRET_KEY