diff --git a/bitnami/cassandra/5.0/debian-12/Dockerfile b/bitnami/cassandra/5.0/debian-12/Dockerfile
index 1e82c3b2c4aa..2ccc228c30dd 100644
--- a/bitnami/cassandra/5.0/debian-12/Dockerfile
+++ b/bitnami/cassandra/5.0/debian-12/Dockerfile
@@ -8,11 +8,11 @@ ARG TARGETARCH
 
 LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
-      org.opencontainers.image.created="2024-09-09T08:13:38Z" \
+      org.opencontainers.image.created="2024-09-09T15:34:01Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/cassandra/README.md" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="5.0.0-debian-12-r2" \
+      org.opencontainers.image.ref.name="5.0.0-debian-12-r3" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/cassandra" \
       org.opencontainers.image.title="cassandra" \
       org.opencontainers.image.vendor="Broadcom, Inc." \
@@ -31,7 +31,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \
     COMPONENTS=( \
       "python-3.11.10-1-linux-${OS_ARCH}-debian-12" \
       "java-11.0.24-9-1-linux-${OS_ARCH}-debian-12" \
-      "cassandra-5.0.0-1-linux-${OS_ARCH}-debian-12" \
+      "cassandra-5.0.0-2-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
diff --git a/bitnami/cassandra/5.0/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/cassandra/5.0/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
index b943a6741567..c81cf0d5e9c0 100644
--- a/bitnami/cassandra/5.0/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/cassandra/5.0/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,7 +3,7 @@
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "5.0.0-1"
+        "version": "5.0.0-2"
     },
     "java": {
         "arch": "amd64",
diff --git a/bitnami/cassandra/5.0/debian-12/rootfs/opt/bitnami/scripts/libcassandra.sh b/bitnami/cassandra/5.0/debian-12/rootfs/opt/bitnami/scripts/libcassandra.sh
index 8cceb4b5569e..906441974dc5 100644
--- a/bitnami/cassandra/5.0/debian-12/rootfs/opt/bitnami/scripts/libcassandra.sh
+++ b/bitnami/cassandra/5.0/debian-12/rootfs/opt/bitnami/scripts/libcassandra.sh
@@ -228,6 +228,22 @@ cassandra_stop() {
 . /opt/bitnami/scripts/libnet.sh
 . /opt/bitnami/scripts/libservice.sh
 . /opt/bitnami/scripts/libvalidations.sh
+. /opt/bitnami/scripts/libversion.sh
+
+########################
+# Returns cassandra major version
+# Globals:
+#   CASSANDRA_BASE_DIR
+# Arguments:
+#   None
+# Returns:
+#   None
+#########################
+cassandra_get_major_version() {
+    cassandra_version="$("${CASSANDRA_BASE_DIR}/bin/cassandra" -v)"
+    major_version="$(get_sematic_version "$cassandra_version" 1)"
+    echo "${major_version:-0}"
+}
 
 ########################
 # Change a Cassandra configuration yaml file by setting a property
@@ -248,9 +264,9 @@ cassandra_yaml_set() {
     local -r conf_file="${4:-$DB_CONF_FILE}"
 
     if is_boolean_yes "$use_quotes"; then
-        replace_in_file "$conf_file" "^(#\s)?(\s*)(\-\s*)?${property}:.*" "\2\3${property}: '${value}'"
+        replace_in_file "$conf_file" "^(\s*)(#\s*)?(\s*)(\-\s*)?${property}:.*" "\1\3\4${property}: '${value}'"
     else
-        replace_in_file "$conf_file" "^(#\s)?(\s*)(\-\s*)?${property}:.*" "\2\3${property}: ${value}"
+        replace_in_file "$conf_file" "^(\s*)(#\s*)?(\s*)(\-\s*)?${property}:.*" "\1\3\4${property}: ${value}"
     fi
 }
 
@@ -550,10 +566,16 @@ cassandra_setup_data_dirs() {
 cassandra_enable_auth() {
     if ! cassandra_is_file_external "${DB_MOUNTED_CONF_PATH}"; then
         if [[ "$ALLOW_EMPTY_PASSWORD" = "yes" ]] && [[ -z $DB_PASSWORD ]]; then
-            cassandra_yaml_set "authenticator" "AllowAllAuthenticator"
+            if [[ "$DB_FLAVOR" = "scylladb" ]] || [ "$(cassandra_get_major_version)" -lt 5 ]; then
+                cassandra_yaml_set "authenticator" "AllowAllAuthenticator"
+            fi
             cassandra_yaml_set "authorizer" "AllowAllAuthorizer"
-        else
-            cassandra_yaml_set "authenticator" "${DB_AUTHENTICATOR}"
+	else
+            if [[ "$DB_FLAVOR" = "cassandra" ]] && [ "$(cassandra_get_major_version)" -ge 5 ]; then
+	            replace_in_file "${DB_CONF_FILE}" "class_name : org.apache.cassandra.auth.AllowAllAuthenticator" "class_name : org.apache.cassandra.auth.${DB_AUTHENTICATOR}"
+            else
+                cassandra_yaml_set "authenticator" "${DB_AUTHENTICATOR}"
+            fi
             cassandra_yaml_set "authorizer" "${DB_AUTHORIZER}"
         fi
     else