diff --git a/base/cloudnative-pg-operator/configurations/cnpg-cluster.yaml b/base/cloudnative-pg-operator/configurations/cnpg-cluster.yaml
new file mode 100644
index 0000000..2eb79d2
--- /dev/null
+++ b/base/cloudnative-pg-operator/configurations/cnpg-cluster.yaml
@@ -0,0 +1,8 @@
+---
+nameReference:
+- kind: Secret
+  fieldSpecs:
+  - path: spec/superuserSecret/name
+    kind: Cluster
+  - path: spec/bootstrap/initdb/secret/name
+    kind: Cluster
diff --git a/base/cloudnative-pg-operator/kustomization.yaml b/base/cloudnative-pg-operator/kustomization.yaml
index 4e249ba..21bfc3e 100644
--- a/base/cloudnative-pg-operator/kustomization.yaml
+++ b/base/cloudnative-pg-operator/kustomization.yaml
@@ -2,4 +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
\ No newline at end of file
+  - https://raw.githubusercontent.com/cloudnative-pg/cloudnative-pg/release-1.18/releases/cnpg-1.18.1.yaml
+
+configurations:
+  - ./configurations/cnpg-cluster.yaml
\ No newline at end of file