diff --git a/bitnami/cassandra/Chart.yaml b/bitnami/cassandra/Chart.yaml
index 2772e712cf..4b0887c07c 100644
--- a/bitnami/cassandra/Chart.yaml
+++ b/bitnami/cassandra/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: cassandra
-version: 6.0.3
+version: 6.0.4
 appVersion: 3.11.8
 description: Apache Cassandra is a free and open-source distributed database management system designed to handle large amounts of data across many commodity servers, providing high availability with no single point of failure. Cassandra offers robust support for clusters spanning multiple datacenters, with asynchronous masterless replication allowing low latency operations for all clients.
 keywords:
diff --git a/bitnami/cassandra/requirements.lock b/bitnami/cassandra/requirements.lock
index acd0d9ab81..b8a62d5169 100644
--- a/bitnami/cassandra/requirements.lock
+++ b/bitnami/cassandra/requirements.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: common
   repository: https://charts.bitnami.com/bitnami
-  version: 0.9.0
-digest: sha256:ccf956b06766e5af946354f49211badc949847abf87d355c5d93224b45adf0bb
-generated: "2020-10-21T23:33:04.916244357Z"
+  version: 0.10.0
+digest: sha256:cbe8f782ad7168557b9bb101a4d441d3210e2dda09cd249eb8426d1499ce6afc
+generated: "2020-10-27T12:53:36.354177+01:00"
diff --git a/bitnami/cassandra/templates/NOTES.txt b/bitnami/cassandra/templates/NOTES.txt
index 7846705e00..b4b6be6253 100644
--- a/bitnami/cassandra/templates/NOTES.txt
+++ b/bitnami/cassandra/templates/NOTES.txt
@@ -64,11 +64,7 @@ To connect to your database from outside the cluster execute the following comma
 {{- include "common.warnings.rollingTag" .Values.image }}
 {{- include "common.warnings.rollingTag" .Values.metrics.image }}
 {{- include "cassandra.validateValues" . }}
-{{- if (not .Values.dbUser.existingSecret) -}}
-  {{- $secretName := include "common.names.fullname" . }}
-  {{- $requiredPasswords := list -}}
-  {{- $requiredDBPassword := dict "valueKey" "dbUser.password" "secret" $secretName "field" "cassandra-password" "context" $ -}}
-  {{- $requiredPasswords = append $requiredPasswords $requiredDBPassword -}}
-  {{- $requiredPasswordValidationErrors := include "common.validations.values.multiple.empty" (dict "required" $requiredPasswords "context" $) -}}
-  {{- include "common.errors.upgrade.passwords.empty" (dict "validationErrors" (list $requiredPasswordValidationErrors) "context" $) -}}
-{{- end -}}
+
+{{- $secretName := include "common.names.fullname" . }}
+{{- $passwordValidationErrors := include "common.validations.values.cassandra.passwords" (dict "secret" $secretName "context" $) -}}
+{{- include "common.errors.upgrade.passwords.empty" (dict "validationErrors" (list $passwordValidationErrors) "context" $) -}}