diff --git a/bitnami/cassandra/CHANGELOG.md b/bitnami/cassandra/CHANGELOG.md
index c281bba7e6..f52cbe795e 100644
--- a/bitnami/cassandra/CHANGELOG.md
+++ b/bitnami/cassandra/CHANGELOG.md
@@ -1,8 +1,12 @@
 # Changelog
 
-## 12.3.11 (2025-08-13)
+## 12.3.13 (2025-10-02)
 
-* [bitnami/cassandra] Authentication failures when connecting to Cassandra from non-seed (secondary) nodes in multi-replica deployments.   ([#35768](https://github.com/bitnami/charts/pull/35768))
+* [bitnami/cassandra] Fix tls autoGenerated when using usePasswordFiles ([#36321](https://github.com/bitnami/charts/pull/36321))
+
+## <small>12.3.11 (2025-08-21)</small>
+
+* [bitnami/cassandra] Authentication failures when connecting to Cassandra from non-seed (secondary) n ([f4886f2](https://github.com/bitnami/charts/commit/f4886f2be21e3b30b997b15ff95dad40e3c89e78)), closes [#35768](https://github.com/bitnami/charts/issues/35768)
 
 ## <small>12.3.10 (2025-08-11)</small>
 
diff --git a/bitnami/cassandra/Chart.yaml b/bitnami/cassandra/Chart.yaml
index ee8c350330..f930d722e5 100644
--- a/bitnami/cassandra/Chart.yaml
+++ b/bitnami/cassandra/Chart.yaml
@@ -34,4 +34,4 @@ maintainers:
 name: cassandra
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/cassandra
-version: 12.3.12
+version: 12.3.13
diff --git a/bitnami/cassandra/templates/statefulset.yaml b/bitnami/cassandra/templates/statefulset.yaml
index 5963a618a5..1ed4683801 100644
--- a/bitnami/cassandra/templates/statefulset.yaml
+++ b/bitnami/cassandra/templates/statefulset.yaml
@@ -154,6 +154,13 @@ spec:
           - |-
             {{- if .Values.tls.autoGenerated }}
             if [[ -f "/certs/tls.key" ]] && [[ -f "/certs/tls.crt" ]] && [[ -f "/certs/ca.crt" ]]; then
+              if [[ -n "${CASSANDRA_KEYSTORE_PASSWORD_FILE}" ]]; then
+                  CASSANDRA_KEYSTORE_PASSWORD="$(<${CASSANDRA_KEYSTORE_PASSWORD_FILE})"
+              fi
+              if [[ -n "${CASSANDRA_TRUSTSTORE_PASSWORD_FILE}" ]]; then
+                  CASSANDRA_TRUSTSTORE_PASSWORD="$(<${CASSANDRA_TRUSTSTORE_PASSWORD_FILE})"
+              fi
+
               openssl pkcs12 -export -in "/certs/tls.crt" \
                   -passout pass:"${CASSANDRA_KEYSTORE_PASSWORD}" \
                   -inkey "/certs/tls.key" \