diff --git a/clusters/cl01tl/manifests/authentik/Cluster-authentik-postgresql-18-cluster.yaml b/clusters/cl01tl/manifests/authentik/Cluster-authentik-postgresql-18-cluster.yaml
index 09fe6dae5..3ccc35b54 100644
--- a/clusters/cl01tl/manifests/authentik/Cluster-authentik-postgresql-18-cluster.yaml
+++ b/clusters/cl01tl/manifests/authentik/Cluster-authentik-postgresql-18-cluster.yaml
@@ -54,13 +54,13 @@ spec:
   bootstrap:
     recovery:
       database: app
-      source: authentik-postgresql-18-backup-1
+      source: authentik-postgresql-18-backup-2
   externalClusters:
-    - name: authentik-postgresql-18-backup-1
+    - name: authentik-postgresql-18-backup-2
       plugin:
         name: barman-cloud.cloudnative-pg.io
         enabled: true
         isWALArchiver: false
         parameters:
           barmanObjectName: "authentik-postgresql-18-recovery"
-          serverName: authentik-postgresql-18-backup-1
+          serverName: authentik-postgresql-18-backup-2
diff --git a/clusters/cl01tl/manifests/authentik/ScheduledBackup-authentik-postgresql-18-scheduled-backup-live-backup.yaml b/clusters/cl01tl/manifests/authentik/ScheduledBackup-authentik-postgresql-18-scheduled-backup-live-backup.yaml
index 74aaa815e..2be8420e9 100644
--- a/clusters/cl01tl/manifests/authentik/ScheduledBackup-authentik-postgresql-18-scheduled-backup-live-backup.yaml
+++ b/clusters/cl01tl/manifests/authentik/ScheduledBackup-authentik-postgresql-18-scheduled-backup-live-backup.yaml
@@ -13,7 +13,7 @@ metadata:
     app.kubernetes.io/name: "authentik-postgresql-18-scheduled-backup-live-backup"
 spec:
   immediate: true
-  suspend: true
+  suspend: false
   schedule: "0 0 0 * * *"
   backupOwnerReference: self
   cluster:
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 3ed4b2233..db985aee3 100644
--- a/clusters/cl01tl/manifests/freshrss/Cluster-freshrss-postgresql-18-cluster.yaml
+++ b/clusters/cl01tl/manifests/freshrss/Cluster-freshrss-postgresql-18-cluster.yaml
@@ -54,13 +54,13 @@ spec:
   bootstrap:
     recovery:
       database: app
-      source: freshrss-postgresql-18-backup-1
+      source: freshrss-postgresql-18-backup-2
   externalClusters:
-    - name: freshrss-postgresql-18-backup-1
+    - name: freshrss-postgresql-18-backup-2
       plugin:
         name: barman-cloud.cloudnative-pg.io
         enabled: true
         isWALArchiver: false
         parameters:
           barmanObjectName: "freshrss-postgresql-18-recovery"
-          serverName: freshrss-postgresql-18-backup-1
+          serverName: freshrss-postgresql-18-backup-2
diff --git a/clusters/cl01tl/manifests/garage/Service-garage-main.yaml b/clusters/cl01tl/manifests/garage/Service-garage-main.yaml
index 62e98c35c..22f3d63c9 100644
--- a/clusters/cl01tl/manifests/garage/Service-garage-main.yaml
+++ b/clusters/cl01tl/manifests/garage/Service-garage-main.yaml
@@ -2,33 +2,31 @@ apiVersion: v1
 kind: Service
 metadata:
   name: garage-main
-  labels:
-    app.kubernetes.io/instance: garage
-    app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/name: garage
-    app.kubernetes.io/service: garage-main
-    helm.sh/chart: garage-4.6.2
   namespace: garage
+  labels:
+    app.kubernetes.io/name: garage-main
+    app.kubernetes.io/service: garage-main
+    app.kubernetes.io/instance: garage
+    app.kubernetes.io/part-of: garage
 spec:
-  type: ClusterIP
   ports:
-    - port: 3903
+    - name: admin
+      port: 3903
+      protocol: TCP
       targetPort: 3903
+    - name: rpc
+      port: 3901
       protocol: TCP
-      name: admin
-    - port: 3901
       targetPort: 3901
+    - name: s3
+      port: 3900
       protocol: TCP
-      name: rpc
-    - port: 3900
       targetPort: 3900
+    - name: web
+      port: 3902
       protocol: TCP
-      name: s3
-    - port: 3902
       targetPort: 3902
-      protocol: TCP
-      name: web
   selector:
-    app.kubernetes.io/controller: server-2
     app.kubernetes.io/instance: garage
     app.kubernetes.io/name: garage
+    garage-type: server
diff --git a/clusters/cl01tl/manifests/harbor/Cluster-harbor-postgresql-18-cluster.yaml b/clusters/cl01tl/manifests/harbor/Cluster-harbor-postgresql-18-cluster.yaml
index 6c3419767..eef040b1f 100644
--- a/clusters/cl01tl/manifests/harbor/Cluster-harbor-postgresql-18-cluster.yaml
+++ b/clusters/cl01tl/manifests/harbor/Cluster-harbor-postgresql-18-cluster.yaml
@@ -54,13 +54,13 @@ spec:
   bootstrap:
     recovery:
       database: app
-      source: harbor-postgresql-18-backup-1
+      source: harbor-postgresql-18-backup-2
   externalClusters:
-    - name: harbor-postgresql-18-backup-1
+    - name: harbor-postgresql-18-backup-2
       plugin:
         name: barman-cloud.cloudnative-pg.io
         enabled: true
         isWALArchiver: false
         parameters:
           barmanObjectName: "harbor-postgresql-18-recovery"
-          serverName: harbor-postgresql-18-backup-1
+          serverName: harbor-postgresql-18-backup-2
diff --git a/clusters/cl01tl/manifests/komodo/Cluster-komodo-postgresql-17-fdb-cluster.yaml b/clusters/cl01tl/manifests/komodo/Cluster-komodo-postgresql-17-fdb-cluster.yaml
index 733c3c44b..3f90c5161 100644
--- a/clusters/cl01tl/manifests/komodo/Cluster-komodo-postgresql-17-fdb-cluster.yaml
+++ b/clusters/cl01tl/manifests/komodo/Cluster-komodo-postgresql-17-fdb-cluster.yaml
@@ -70,13 +70,13 @@ spec:
   bootstrap:
     recovery:
       database: app
-      source: komodo-postgresql-17-fdb-backup-1
+      source: komodo-postgresql-17-fdb-backup-2
   externalClusters:
-    - name: komodo-postgresql-17-fdb-backup-1
+    - name: komodo-postgresql-17-fdb-backup-2
       plugin:
         name: barman-cloud.cloudnative-pg.io
         enabled: true
         isWALArchiver: false
         parameters:
           barmanObjectName: "komodo-postgresql-17-fdb-recovery"
-          serverName: komodo-postgresql-17-fdb-backup-1
+          serverName: komodo-postgresql-17-fdb-backup-2