diff --git a/bitnami/scylladb/6.0/debian-12/Dockerfile b/bitnami/scylladb/6.0/debian-12/Dockerfile
index 8fdc3a74396e..4aa0d08f50f7 100644
--- a/bitnami/scylladb/6.0/debian-12/Dockerfile
+++ b/bitnami/scylladb/6.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-04T14:19:15Z" \
+      org.opencontainers.image.created="2024-09-09T17:46:59Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/scylladb/README.md" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="6.0.3-debian-12-r0" \
+      org.opencontainers.image.ref.name="6.0.3-debian-12-r1" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/scylladb" \
       org.opencontainers.image.title="scylladb" \
       org.opencontainers.image.vendor="Broadcom, Inc." \
@@ -29,9 +29,9 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl libatomic1 libblkid1 libbz2-1.0 libcap2 libcom-err2 libcrypt1 libffi8 libgcc-s1 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed6 libicu72 libidn2-0 libjsoncpp25 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblz4-1 liblzma5 libmount1 libmpfr6 libncursesw6 libnettle8 libnsl2 libp11-kit0 libpcre2-8-0 libreadline8 libselinux1 libsmartcols1 libsqlite3-0 libssl3 libstdc++6 libsystemd0 libtasn1-6 libtinfo6 libtirpc3 libudev1 libunistring2 libxxhash0 libzstd1 procps rsyslog zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \
     COMPONENTS=( \
-      "python-3.12.5-1-linux-${OS_ARCH}-debian-12" \
+      "python-3.12.6-2-linux-${OS_ARCH}-debian-12" \
       "java-11.0.24-9-1-linux-${OS_ARCH}-debian-12" \
-      "scylladb-6.0.3-0-linux-${OS_ARCH}-debian-12" \
+      "scylladb-6.0.3-1-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
diff --git a/bitnami/scylladb/6.0/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/scylladb/6.0/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
index c3c8b23f8bd5..fa8898f9e3c6 100644
--- a/bitnami/scylladb/6.0/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/scylladb/6.0/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -9,12 +9,12 @@
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "3.12.5-1"
+        "version": "3.12.6-2"
     },
     "scylladb": {
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "6.0.3-0"
+        "version": "6.0.3-1"
     }
 }
\ No newline at end of file
diff --git a/bitnami/scylladb/6.0/debian-12/rootfs/opt/bitnami/scripts/libscylladb.sh b/bitnami/scylladb/6.0/debian-12/rootfs/opt/bitnami/scripts/libscylladb.sh
index 71e19c1d0856..79f50361216f 100644
--- a/bitnami/scylladb/6.0/debian-12/rootfs/opt/bitnami/scripts/libscylladb.sh
+++ b/bitnami/scylladb/6.0/debian-12/rootfs/opt/bitnami/scripts/libscylladb.sh
@@ -231,6 +231,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
@@ -251,9 +267,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
 }
 
@@ -553,10 +569,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