diff --git a/base/cloudnative-pg-operator/configurations/cnpg-cluster.yaml b/base/cloudnative-pg-operator/configurations/cnpg-cluster.yaml
index 2eb79d2..548cd42 100644
--- a/base/cloudnative-pg-operator/configurations/cnpg-cluster.yaml
+++ b/base/cloudnative-pg-operator/configurations/cnpg-cluster.yaml
@@ -6,3 +6,7 @@ nameReference:
     kind: Cluster
   - path: spec/bootstrap/initdb/secret/name
     kind: Cluster
+  - path: spec/backup/barmanObjectStore/s3Credentials/accessKeyId/name
+    kind: Cluster
+  - path: spec/backup/barmanObjectStore/s3Credentials/secretAccessKey/name
+    kind: Cluster
diff --git a/base/cloudnative-pg-operator/kustomization.yaml b/base/cloudnative-pg-operator/kustomization.yaml
index 21bfc3e..4f0dee3 100644
--- a/base/cloudnative-pg-operator/kustomization.yaml
+++ b/base/cloudnative-pg-operator/kustomization.yaml
@@ -2,7 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-  - https://raw.githubusercontent.com/cloudnative-pg/cloudnative-pg/release-1.18/releases/cnpg-1.18.1.yaml
+  - https://github.com/cloudnative-pg/cloudnative-pg/releases/download/v1.21.1/cnpg-1.21.1.yaml
 
 configurations:
   - ./configurations/cnpg-cluster.yaml
\ No newline at end of file