diff --git a/clusters/cl01tl/manifests/sparkyfitness/Cluster-sparkyfitness-postgresql-18-cluster.yaml b/clusters/cl01tl/manifests/sparkyfitness/Cluster-sparkyfitness-postgresql-18-cluster.yaml
index 7d4b8e764..bfb2d644f 100644
--- a/clusters/cl01tl/manifests/sparkyfitness/Cluster-sparkyfitness-postgresql-18-cluster.yaml
+++ b/clusters/cl01tl/manifests/sparkyfitness/Cluster-sparkyfitness-postgresql-18-cluster.yaml
@@ -34,7 +34,7 @@ spec:
   primaryUpdateMethod: switchover
   primaryUpdateStrategy: unsupervised
   logLevel: info
-  enableSuperuserAccess: false
+  enableSuperuserAccess: true
   enablePDB: true
   postgresql:
     parameters:
@@ -52,11 +52,15 @@ spec:
         barmanObjectName: "sparkyfitness-postgresql-18-backup-garage-local"
         serverName: "sparkyfitness-postgresql-18-backup-1"
   bootstrap:
-    initdb:
+    recovery:
       database: app
-      postInitTemplateSQL:
-        - CREATE EXTENSION IF NOT EXISTS "uuid-ossp";
-        - CREATE EXTENSION IF NOT EXISTS "pgcrypto";
-        - CREATE EXTENSION IF NOT EXISTS "pg_stat_statements";
-        - GRANT EXECUTE ON ALL FUNCTIONS IN SCHEMA public TO "app" WITH GRANT OPTION;
-      owner: app
+      source: sparkyfitness-postgresql-18-backup-1
+  externalClusters:
+    - name: sparkyfitness-postgresql-18-backup-1
+      plugin:
+        name: barman-cloud.cloudnative-pg.io
+        enabled: true
+        isWALArchiver: false
+        parameters:
+          barmanObjectName: "sparkyfitness-postgresql-18-recovery"
+          serverName: sparkyfitness-postgresql-18-backup-1
diff --git a/clusters/cl01tl/manifests/sparkyfitness/Deployment-sparkyfitness-server.yaml b/clusters/cl01tl/manifests/sparkyfitness/Deployment-sparkyfitness-server.yaml
index 298737beb..b7063cbbc 100644
--- a/clusters/cl01tl/manifests/sparkyfitness/Deployment-sparkyfitness-server.yaml
+++ b/clusters/cl01tl/manifests/sparkyfitness/Deployment-sparkyfitness-server.yaml
@@ -83,12 +83,12 @@ spec:
             - name: SPARKY_FITNESS_DB_USER
               valueFrom:
                 secretKeyRef:
-                  name: sparkyfitness-postgresql-18-cluster-app
+                  name: sparkyfitness-postgresql-18-cluster-superuser
                   key: username
             - name: SPARKY_FITNESS_DB_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: sparkyfitness-postgresql-18-cluster-app
+                  name: sparkyfitness-postgresql-18-cluster-superuser
                   key: password
             - name: SPARKY_FITNESS_OIDC_CLIENT_ID
               valueFrom: