diff --git a/applications/templates/cloudnativepg.yaml b/applications/templates/cloudnativepg.yaml
index 28078eb..f186422 100644
--- a/applications/templates/cloudnativepg.yaml
+++ b/applications/templates/cloudnativepg.yaml
@@ -44,6 +44,9 @@ metadata:
   name: pg-cluster
   namespace: cnpg-system
 spec:
+  envFrom:
+    - configMapRef:
+        name: postgres-backup-bucket
   instances: 2
   priorityClassName: homelab-critical
   resources:
@@ -70,8 +73,8 @@ spec:
     storageClass: local-path
   backup:
     barmanObjectStore:
-      endpointURL: http://rook-ceph-rgw-rgw-bulk.ceph.svc:80
-      destinationPath: "s3://backup-cnpg/"
+      endpointURL: http://${BUCKET_HOST}:${BUCKET_PORT}
+      destinationPath: "s3://${BUCKET_NAME}/"
       s3Credentials:
         accessKeyId:
           name: postgres-backup-bucket
@@ -87,6 +90,8 @@ spec:
   managed:
     roles:
     - name: marco
+      connectionlimit: -1
+      ensure: present
       login: true
       superuser: true
       passwordSecret: