diff --git a/charts/system/cloudnative-pg/templates/common.yaml b/charts/system/cloudnative-pg/templates/common.yaml
index 995efb03eb0..eadf5a1c2c5 100644
--- a/charts/system/cloudnative-pg/templates/common.yaml
+++ b/charts/system/cloudnative-pg/templates/common.yaml
@@ -1,5 +1,9 @@
 {{/* Make sure all variables are set properly */}}
 {{- include "tc.v1.common.loader.init" . }}
 
+{{- if or .Values.credentials .Values.credentialsList }}
+{{- fail "Don't try to add credenatials to CloudNative-PG, add them to the individual charts using CloudNative-PG" }}
+{{- end }}
+
 {{/* Render the templates */}}
 {{ include "tc.v1.common.loader.apply" . }}