From a8ae70cf70b06dcf5203d8eb1d2e2884a8146de5 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Tue, 7 May 2024 13:15:43 +0200
Subject: [PATCH] [bitnami/cassandra] Release 4.1.4-debian-12-r10 (#66281)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/cassandra/4.1/debian-12/Dockerfile    |  10 +-
 .../4.1/debian-12/docker-compose.yml          |   2 +-
 .../opt/bitnami/scripts/libbitnami.sh         |   2 +-
 .../prebuildfs/opt/bitnami/scripts/libfile.sh |   2 +-
 .../prebuildfs/opt/bitnami/scripts/libfs.sh   |   2 +-
 .../prebuildfs/opt/bitnami/scripts/libhook.sh |   2 +-
 .../prebuildfs/opt/bitnami/scripts/liblog.sh  |   2 +-
 .../prebuildfs/opt/bitnami/scripts/libnet.sh  |   2 +-
 .../prebuildfs/opt/bitnami/scripts/libos.sh   |   2 +-
 .../opt/bitnami/scripts/libpersistence.sh     |   2 +-
 .../opt/bitnami/scripts/libservice.sh         |  10 +-
 .../opt/bitnami/scripts/libvalidations.sh     |   2 +-
 .../opt/bitnami/scripts/libversion.sh         |   2 +-
 .../opt/bitnami/scripts/libwebserver.sh       |   2 +-
 .../prebuildfs/usr/sbin/install_packages      |   2 +-
 .../debian-12/prebuildfs/usr/sbin/run-script  |   2 +-
 .../opt/bitnami/scripts/cassandra-env.sh      | 120 +++++++++++----
 .../bitnami/scripts/cassandra/entrypoint.sh   |   8 +-
 .../bitnami/scripts/cassandra/postunpack.sh   |  14 +-
 .../opt/bitnami/scripts/cassandra/run.sh      |  18 +--
 .../opt/bitnami/scripts/cassandra/setup.sh    |   6 +-
 .../opt/bitnami/scripts/java/entrypoint.sh    |   2 +-
 .../opt/bitnami/scripts/java/postunpack.sh    |   2 +-
 .../opt/bitnami/scripts/libcassandra.sh       |   2 +-
 bitnami/cassandra/README.md                   | 142 +++++++++---------
 bitnami/cassandra/docker-compose-cluster.yml  |   2 +-
 bitnami/cassandra/docker-compose.yml          |   2 +-
 27 files changed, 212 insertions(+), 154 deletions(-)

diff --git a/bitnami/cassandra/4.1/debian-12/Dockerfile b/bitnami/cassandra/4.1/debian-12/Dockerfile
index 726da5d50926..86c61705465d 100644
--- a/bitnami/cassandra/4.1/debian-12/Dockerfile
+++ b/bitnami/cassandra/4.1/debian-12/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright VMware, Inc.
+# Copyright Broadcom, Inc. All Rights Reserved.
 # SPDX-License-Identifier: APACHE-2.0
 
 FROM docker.io/bitnami/minideb:bookworm
@@ -8,14 +8,14 @@ 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-05-04T08:00:54Z" \
-      org.opencontainers.image.description="Application packaged by VMware, Inc" \
+      org.opencontainers.image.created="2024-05-07T10:36:25Z" \
+      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="4.1.4-debian-12-r9" \
+      org.opencontainers.image.ref.name="4.1.4-debian-12-r10" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/cassandra" \
       org.opencontainers.image.title="cassandra" \
-      org.opencontainers.image.vendor="VMware, Inc." \
+      org.opencontainers.image.vendor="Broadcom, Inc." \
       org.opencontainers.image.version="4.1.4"
 
 ENV HOME="/" \
diff --git a/bitnami/cassandra/4.1/debian-12/docker-compose.yml b/bitnami/cassandra/4.1/debian-12/docker-compose.yml
index af3d31b2f806..134ec313c186 100644
--- a/bitnami/cassandra/4.1/debian-12/docker-compose.yml
+++ b/bitnami/cassandra/4.1/debian-12/docker-compose.yml
@@ -1,4 +1,4 @@
-# Copyright VMware, Inc.
+# Copyright Broadcom, Inc. All Rights Reserved.
 # SPDX-License-Identifier: APACHE-2.0
 
 version: '2'
diff --git a/bitnami/cassandra/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/cassandra/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libbitnami.sh
index aa782fc6a4db..d239f9853573 100644
--- a/bitnami/cassandra/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libbitnami.sh
+++ b/bitnami/cassandra/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libbitnami.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright VMware, Inc.
+# Copyright Broadcom, Inc. All Rights Reserved.
 # SPDX-License-Identifier: APACHE-2.0
 #
 # Bitnami custom library
diff --git a/bitnami/cassandra/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libfile.sh b/bitnami/cassandra/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libfile.sh
index 63759c777f3b..1c69e0e48a5d 100644
--- a/bitnami/cassandra/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libfile.sh
+++ b/bitnami/cassandra/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libfile.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright VMware, Inc.
+# Copyright Broadcom, Inc. All Rights Reserved.
 # SPDX-License-Identifier: APACHE-2.0
 #
 # Library for managing files
diff --git a/bitnami/cassandra/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/cassandra/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libfs.sh
index 96b22f99710c..970d62417964 100644
--- a/bitnami/cassandra/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libfs.sh
+++ b/bitnami/cassandra/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libfs.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright VMware, Inc.
+# Copyright Broadcom, Inc. All Rights Reserved.
 # SPDX-License-Identifier: APACHE-2.0
 #
 # Library for file system actions
diff --git a/bitnami/cassandra/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libhook.sh b/bitnami/cassandra/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libhook.sh
index dadd06149e00..f3a5fe7868ee 100644
--- a/bitnami/cassandra/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libhook.sh
+++ b/bitnami/cassandra/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libhook.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright VMware, Inc.
+# Copyright Broadcom, Inc. All Rights Reserved.
 # SPDX-License-Identifier: APACHE-2.0
 #
 # Library to use for scripts expected to be used as Kubernetes lifecycle hooks
diff --git a/bitnami/cassandra/4.1/debian-12/prebuildfs/opt/bitnami/scripts/liblog.sh b/bitnami/cassandra/4.1/debian-12/prebuildfs/opt/bitnami/scripts/liblog.sh
index 2a9e76a4d725..450f05bd823f 100644
--- a/bitnami/cassandra/4.1/debian-12/prebuildfs/opt/bitnami/scripts/liblog.sh
+++ b/bitnami/cassandra/4.1/debian-12/prebuildfs/opt/bitnami/scripts/liblog.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright VMware, Inc.
+# Copyright Broadcom, Inc. All Rights Reserved.
 # SPDX-License-Identifier: APACHE-2.0
 #
 # Library for logging functions
diff --git a/bitnami/cassandra/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libnet.sh b/bitnami/cassandra/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libnet.sh
index b47c69a56825..90652245c2a7 100644
--- a/bitnami/cassandra/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libnet.sh
+++ b/bitnami/cassandra/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libnet.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright VMware, Inc.
+# Copyright Broadcom, Inc. All Rights Reserved.
 # SPDX-License-Identifier: APACHE-2.0
 #
 # Library for network functions
diff --git a/bitnami/cassandra/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/cassandra/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh
index c0500acee78d..9d908c48579b 100644
--- a/bitnami/cassandra/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh
+++ b/bitnami/cassandra/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright VMware, Inc.
+# Copyright Broadcom, Inc. All Rights Reserved.
 # SPDX-License-Identifier: APACHE-2.0
 #
 # Library for operating system actions
diff --git a/bitnami/cassandra/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libpersistence.sh b/bitnami/cassandra/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libpersistence.sh
index af6af64d6dd0..18445e7d27fa 100644
--- a/bitnami/cassandra/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libpersistence.sh
+++ b/bitnami/cassandra/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libpersistence.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright VMware, Inc.
+# Copyright Broadcom, Inc. All Rights Reserved.
 # SPDX-License-Identifier: APACHE-2.0
 #
 # Bitnami persistence library
diff --git a/bitnami/cassandra/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/cassandra/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh
index 107f54e6b5c9..1f9b33096b02 100644
--- a/bitnami/cassandra/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh
+++ b/bitnami/cassandra/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright VMware, Inc.
+# Copyright Broadcom, Inc. All Rights Reserved.
 # SPDX-License-Identifier: APACHE-2.0
 #
 # Library for managing services
@@ -132,7 +132,7 @@ generate_cron_conf() {
     mkdir -p /etc/cron.d
     if "$clean"; then
         cat > "/etc/cron.d/${service_name}" <<EOF
-# Copyright VMware, Inc.
+# Copyright Broadcom, Inc. All Rights Reserved.
 # SPDX-License-Identifier: APACHE-2.0
 
 ${schedule} ${run_as} ${cmd}
@@ -193,7 +193,7 @@ generate_monit_conf() {
     is_boolean_yes "$disabled" && conf_suffix=".disabled"
     mkdir -p "$monit_conf_dir"
     cat > "${monit_conf_dir}/${service_name}.conf${conf_suffix:-}" <<EOF
-# Copyright VMware, Inc.
+# Copyright Broadcom, Inc. All Rights Reserved.
 # SPDX-License-Identifier: APACHE-2.0
 
 check process ${service_name}
@@ -255,7 +255,7 @@ generate_logrotate_conf() {
 
     mkdir -p "$logrotate_conf_dir"
     cat <<EOF | sed '/^\s*$/d' > "${logrotate_conf_dir}/${service_name}"
-# Copyright VMware, Inc.
+# Copyright Broadcom, Inc. All Rights Reserved.
 # SPDX-License-Identifier: APACHE-2.0
 
 ${log_path} {
@@ -402,7 +402,7 @@ generate_systemd_conf() {
     fi
     # Generate the Systemd unit
     cat > "$service_file" <<EOF
-# Copyright VMware, Inc.
+# Copyright Broadcom, Inc. All Rights Reserved.
 # SPDX-License-Identifier: APACHE-2.0
 
 [Unit]
diff --git a/bitnami/cassandra/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/cassandra/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh
index 16183f62d080..b4084bbe976b 100644
--- a/bitnami/cassandra/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh
+++ b/bitnami/cassandra/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright VMware, Inc.
+# Copyright Broadcom, Inc. All Rights Reserved.
 # SPDX-License-Identifier: APACHE-2.0
 #
 # Validation functions library
diff --git a/bitnami/cassandra/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh b/bitnami/cassandra/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh
index 6ca71ac7bdbb..f0d5a5cd3389 100644
--- a/bitnami/cassandra/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh
+++ b/bitnami/cassandra/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright VMware, Inc.
+# Copyright Broadcom, Inc. All Rights Reserved.
 # SPDX-License-Identifier: APACHE-2.0
 #
 # Library for managing versions strings
diff --git a/bitnami/cassandra/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/cassandra/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libwebserver.sh
index 8023f9b0549a..acb84fc2339b 100644
--- a/bitnami/cassandra/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libwebserver.sh
+++ b/bitnami/cassandra/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libwebserver.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright VMware, Inc.
+# Copyright Broadcom, Inc. All Rights Reserved.
 # SPDX-License-Identifier: APACHE-2.0
 #
 # Bitnami web server handler library
diff --git a/bitnami/cassandra/4.1/debian-12/prebuildfs/usr/sbin/install_packages b/bitnami/cassandra/4.1/debian-12/prebuildfs/usr/sbin/install_packages
index acbc3173208c..ccce248b2d14 100755
--- a/bitnami/cassandra/4.1/debian-12/prebuildfs/usr/sbin/install_packages
+++ b/bitnami/cassandra/4.1/debian-12/prebuildfs/usr/sbin/install_packages
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright VMware, Inc.
+# Copyright Broadcom, Inc. All Rights Reserved.
 # SPDX-License-Identifier: APACHE-2.0
 set -eu
 
diff --git a/bitnami/cassandra/4.1/debian-12/prebuildfs/usr/sbin/run-script b/bitnami/cassandra/4.1/debian-12/prebuildfs/usr/sbin/run-script
index 4ca0f897277e..0e07c9038dfd 100755
--- a/bitnami/cassandra/4.1/debian-12/prebuildfs/usr/sbin/run-script
+++ b/bitnami/cassandra/4.1/debian-12/prebuildfs/usr/sbin/run-script
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright VMware, Inc.
+# Copyright Broadcom, Inc. All Rights Reserved.
 # SPDX-License-Identifier: APACHE-2.0
 set -u
 
diff --git a/bitnami/cassandra/4.1/debian-12/rootfs/opt/bitnami/scripts/cassandra-env.sh b/bitnami/cassandra/4.1/debian-12/rootfs/opt/bitnami/scripts/cassandra-env.sh
index c9dc3792ac12..0ea1fcad3351 100644
--- a/bitnami/cassandra/4.1/debian-12/rootfs/opt/bitnami/scripts/cassandra-env.sh
+++ b/bitnami/cassandra/4.1/debian-12/rootfs/opt/bitnami/scripts/cassandra-env.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright VMware, Inc.
+# Copyright Broadcom, Inc. All Rights Reserved.
 # SPDX-License-Identifier: APACHE-2.0
 #
 # Environment configuration for cassandra
@@ -24,9 +24,6 @@ export BITNAMI_DEBUG="${BITNAMI_DEBUG:-false}"
 # By setting an environment variable matching *_FILE to a file path, the prefixed environment
 # variable will be overridden with the value specified in that file
 cassandra_env_vars=(
-    CASSANDRA_VOLUME_DIR
-    CASSANDRA_DATA_DIR
-    CASSANDRA_COMMITLOG_DIR
     CASSANDRA_MOUNTED_CONF_DIR
     CASSANDRA_CLIENT_ENCRYPTION
     CASSANDRA_CLUSTER_NAME
@@ -42,7 +39,6 @@ cassandra_env_vars=(
     CASSANDRA_PASSWORD_SEEDER
     CASSANDRA_SEEDS
     CASSANDRA_PEERS
-    CASSANDRA_PEERS
     CASSANDRA_NODES
     CASSANDRA_RACK
     CASSANDRA_BROADCAST_ADDRESS
@@ -69,6 +65,8 @@ cassandra_env_vars=(
     CASSANDRA_TRUSTSTORE_PASSWORD
     CASSANDRA_KEYSTORE_LOCATION
     CASSANDRA_TRUSTSTORE_LOCATION
+    CASSANDRA_TMP_P12_FILE
+    CASSANDRA_SSL_CERT_FILE
     CASSANDRA_SSL_VALIDATE
     SSL_VERSION
 )
@@ -84,90 +82,150 @@ for env_var in "${cassandra_env_vars[@]}"; do
     fi
 done
 unset cassandra_env_vars
+export DB_FLAVOR="cassandra"
 
 # Paths
-export CASSANDRA_BASE_DIR="${BITNAMI_ROOT_DIR}/cassandra"
-export CASSANDRA_BIN_DIR="${CASSANDRA_BASE_DIR}/bin"
-export CASSANDRA_CONF_DIR="${CASSANDRA_BASE_DIR}/conf"
-export CASSANDRA_VOLUME_DIR="${CASSANDRA_VOLUME_DIR:-/bitnami/cassandra}"
-export CASSANDRA_DATA_DIR="${CASSANDRA_DATA_DIR:-${CASSANDRA_VOLUME_DIR}/data}"
-export CASSANDRA_COMMITLOG_DIR="${CASSANDRA_COMMITLOG_DIR:-${CASSANDRA_DATA_DIR}/commitlog}"
-export CASSANDRA_DEFAULT_CONF_DIR="${CASSANDRA_BASE_DIR}/conf.default"
+export CASSANDRA_BASE_DIR="/opt/bitnami/cassandra"
+export DB_BASE_DIR="$CASSANDRA_BASE_DIR"
+export CASSANDRA_BIN_DIR="${DB_BASE_DIR}/bin"
+export DB_BIN_DIR="$CASSANDRA_BIN_DIR"
+export CASSANDRA_CONF_DIR="${DB_BASE_DIR}/conf"
+export DB_CONF_DIR="$CASSANDRA_CONF_DIR"
+export CASSANDRA_VOLUME_DIR="/bitnami/cassandra"
+export DB_VOLUME_DIR="$CASSANDRA_VOLUME_DIR"
+export CASSANDRA_DATA_DIR="${DB_VOLUME_DIR}/data"
+export DB_DATA_DIR="$CASSANDRA_DATA_DIR"
+export CASSANDRA_COMMITLOG_DIR="${DB_DATA_DIR}/commitlog"
+export DB_COMMITLOG_DIR="$CASSANDRA_COMMITLOG_DIR"
+export CASSANDRA_DEFAULT_CONF_DIR="${DB_BASE_DIR}/conf.default"
+export DB_DEFAULT_CONF_DIR="$CASSANDRA_DEFAULT_CONF_DIR"
 export CASSANDRA_INITSCRIPTS_DIR="/docker-entrypoint-initdb.d"
-export CASSANDRA_LOG_DIR="${CASSANDRA_BASE_DIR}/logs"
-export CASSANDRA_MOUNTED_CONF_DIR="${CASSANDRA_MOUNTED_CONF_DIR:-${CASSANDRA_VOLUME_DIR}/conf}"
-export CASSANDRA_TMP_DIR="${CASSANDRA_BASE_DIR}/tmp"
+export DB_INITSCRIPTS_DIR="$CASSANDRA_INITSCRIPTS_DIR"
+export CASSANDRA_LOG_DIR="${DB_BASE_DIR}/logs"
+export DB_LOG_DIR="$CASSANDRA_LOG_DIR"
+export CASSANDRA_MOUNTED_CONF_DIR="${CASSANDRA_MOUNTED_CONF_DIR:-${DB_VOLUME_DIR}/conf}"
+export DB_MOUNTED_CONF_DIR="$CASSANDRA_MOUNTED_CONF_DIR"
+export CASSANDRA_TMP_DIR="${DB_BASE_DIR}/tmp"
+export DB_TMP_DIR="$CASSANDRA_TMP_DIR"
 export JAVA_BASE_DIR="${BITNAMI_ROOT_DIR}/java"
 export JAVA_BIN_DIR="${JAVA_BASE_DIR}/bin"
 export PYTHON_BASE_DIR="${BITNAMI_ROOT_DIR}/python"
 export PYTHON_BIN_DIR="${PYTHON_BASE_DIR}/bin"
-export CASSANDRA_CONF_FILE="${CASSANDRA_CONF_DIR}/cassandra.yaml"
-export CASSANDRA_LOG_FILE="${CASSANDRA_LOG_DIR}/cassandra.log"
-export CASSANDRA_FIRST_BOOT_LOG_FILE="${CASSANDRA_LOG_DIR}/cassandra_first_boot.log"
-export CASSANDRA_INITSCRIPTS_BOOT_LOG_FILE="${CASSANDRA_LOG_DIR}/cassandra_init_scripts_boot.log"
-export CASSANDRA_PID_FILE="${CASSANDRA_TMP_DIR}/cassandra.pid"
-export PATH="${CASSANDRA_BIN_DIR}:${JAVA_BIN_DIR}:${PYTHON_BIN_DIR}:${BITNAMI_ROOT_DIR}/common/bin:${PATH}"
+export CASSANDRA_CONF_FILE="${DB_CONF_DIR}/cassandra.yaml"
+export DB_CONF_FILE="$CASSANDRA_CONF_FILE"
+export CASSANDRA_LOG_FILE="${DB_LOG_DIR}/cassandra.log"
+export DB_LOG_FILE="$CASSANDRA_LOG_FILE"
+export CASSANDRA_FIRST_BOOT_LOG_FILE="${DB_LOG_DIR}/cassandra_first_boot.log"
+export DB_FIRST_BOOT_LOG_FILE="$CASSANDRA_FIRST_BOOT_LOG_FILE"
+export CASSANDRA_INITSCRIPTS_BOOT_LOG_FILE="${DB_LOG_DIR}/cassandra_init_scripts_boot.log"
+export DB_INITSCRIPTS_BOOT_LOG_FILE="$CASSANDRA_INITSCRIPTS_BOOT_LOG_FILE"
+export CASSANDRA_PID_FILE="${DB_TMP_DIR}/cassandra.pid"
+export DB_PID_FILE="$CASSANDRA_PID_FILE"
+export PATH="${DB_BIN_DIR}:${BITNAMI_ROOT_DIR}/common/bin:${BITNAMI_ROOT_DIR}/python/bin:${BITNAMI_ROOT_DIR}/java/bin:$PATH"
 
 # System users (when running with a privileged user)
 export CASSANDRA_DAEMON_USER="cassandra"
+export DB_DAEMON_USER="$CASSANDRA_DAEMON_USER"
 export CASSANDRA_DAEMON_GROUP="cassandra"
+export DB_DAEMON_GROUP="$CASSANDRA_DAEMON_GROUP"
 
-# Cassandra cluster serttings
+# Cassandra cluster settings
 export CASSANDRA_CLIENT_ENCRYPTION="${CASSANDRA_CLIENT_ENCRYPTION:-false}"
+export DB_CLIENT_ENCRYPTION="$CASSANDRA_CLIENT_ENCRYPTION"
 export CASSANDRA_CLUSTER_NAME="${CASSANDRA_CLUSTER_NAME:-My Cluster}"
+export DB_CLUSTER_NAME="$CASSANDRA_CLUSTER_NAME"
 export CASSANDRA_DATACENTER="${CASSANDRA_DATACENTER:-dc1}"
+export DB_DATACENTER="$CASSANDRA_DATACENTER"
 export CASSANDRA_ENABLE_REMOTE_CONNECTIONS="${CASSANDRA_ENABLE_REMOTE_CONNECTIONS:-true}"
-export CASSANDRA_ENABLE_RPC="${CASSANDRA_ENABLE_RPC:-true}"
+export DB_ENABLE_REMOTE_CONNECTIONS="$CASSANDRA_ENABLE_REMOTE_CONNECTIONS"
+export CASSANDRA_ENABLE_RPC="${CASSANDRA_ENABLE_RPC:-false}"
+export DB_ENABLE_RPC="$CASSANDRA_ENABLE_RPC"
 export CASSANDRA_ENABLE_USER_DEFINED_FUNCTIONS="${CASSANDRA_ENABLE_USER_DEFINED_FUNCTIONS:-false}"
+export DB_ENABLE_USER_DEFINED_FUNCTIONS="$CASSANDRA_ENABLE_USER_DEFINED_FUNCTIONS"
 export CASSANDRA_ENABLE_SCRIPTED_USER_DEFINED_FUNCTIONS="${CASSANDRA_ENABLE_SCRIPTED_USER_DEFINED_FUNCTIONS:-false}"
+export DB_ENABLE_SCRIPTED_USER_DEFINED_FUNCTIONS="$CASSANDRA_ENABLE_SCRIPTED_USER_DEFINED_FUNCTIONS"
 export CASSANDRA_ENDPOINT_SNITCH="${CASSANDRA_ENDPOINT_SNITCH:-SimpleSnitch}"
+export DB_ENDPOINT_SNITCH="$CASSANDRA_ENDPOINT_SNITCH"
 export CASSANDRA_HOST="${CASSANDRA_HOST:-}"
+export DB_HOST="$CASSANDRA_HOST"
 export CASSANDRA_INTERNODE_ENCRYPTION="${CASSANDRA_INTERNODE_ENCRYPTION:-none}"
+export DB_INTERNODE_ENCRYPTION="$CASSANDRA_INTERNODE_ENCRYPTION"
 export CASSANDRA_NUM_TOKENS="${CASSANDRA_NUM_TOKENS:-256}"
+export DB_NUM_TOKENS="$CASSANDRA_NUM_TOKENS"
 export CASSANDRA_PASSWORD_SEEDER="${CASSANDRA_PASSWORD_SEEDER:-no}"
-export CASSANDRA_SEEDS="${CASSANDRA_SEEDS:-$CASSANDRA_HOST}"
-export CASSANDRA_PEERS="${CASSANDRA_PEERS:-$CASSANDRA_SEEDS}"
-export CASSANDRA_PEERS="${CASSANDRA_PEERS:-$CASSANDRA_SEEDS}"
+export DB_PASSWORD_SEEDER="$CASSANDRA_PASSWORD_SEEDER"
+export CASSANDRA_SEEDS="${CASSANDRA_SEEDS:-$DB_HOST}"
+export DB_SEEDS="$CASSANDRA_SEEDS"
+export CASSANDRA_PEERS="${CASSANDRA_PEERS:-$DB_SEEDS}"
+export DB_PEERS="$CASSANDRA_PEERS"
 export CASSANDRA_NODES="${CASSANDRA_NODES:-}"
+export DB_NODES="$CASSANDRA_NODES"
 export CASSANDRA_RACK="${CASSANDRA_RACK:-rack1}"
+export DB_RACK="$CASSANDRA_RACK"
 export CASSANDRA_BROADCAST_ADDRESS="${CASSANDRA_BROADCAST_ADDRESS:-}"
+export DB_BROADCAST_ADDRESS="$CASSANDRA_BROADCAST_ADDRESS"
 export CASSANDRA_AUTOMATIC_SSTABLE_UPGRADE="${CASSANDRA_AUTOMATIC_SSTABLE_UPGRADE:-false}"
+export DB_AUTOMATIC_SSTABLE_UPGRADE="$CASSANDRA_AUTOMATIC_SSTABLE_UPGRADE"
 
 # Database initialization settings
 export CASSANDRA_STARTUP_CQL="${CASSANDRA_STARTUP_CQL:-}"
+export DB_STARTUP_CQL="$CASSANDRA_STARTUP_CQL"
 export CASSANDRA_IGNORE_INITDB_SCRIPTS="${CASSANDRA_IGNORE_INITDB_SCRIPTS:-no}"
+export DB_IGNORE_INITDB_SCRIPTS="$CASSANDRA_IGNORE_INITDB_SCRIPTS"
 
 # Port configuration
 export CASSANDRA_CQL_PORT_NUMBER="${CASSANDRA_CQL_PORT_NUMBER:-9042}"
+export DB_CQL_PORT_NUMBER="$CASSANDRA_CQL_PORT_NUMBER"
 export CASSANDRA_JMX_PORT_NUMBER="${CASSANDRA_JMX_PORT_NUMBER:-7199}"
+export DB_JMX_PORT_NUMBER="$CASSANDRA_JMX_PORT_NUMBER"
 export CASSANDRA_TRANSPORT_PORT_NUMBER="${CASSANDRA_TRANSPORT_PORT_NUMBER:-7000}"
+export DB_TRANSPORT_PORT_NUMBER="$CASSANDRA_TRANSPORT_PORT_NUMBER"
 
 # Retries and sleep time configuration
 export CASSANDRA_CQL_MAX_RETRIES="${CASSANDRA_CQL_MAX_RETRIES:-20}"
+export DB_CQL_MAX_RETRIES="$CASSANDRA_CQL_MAX_RETRIES"
 export CASSANDRA_CQL_SLEEP_TIME="${CASSANDRA_CQL_SLEEP_TIME:-5}"
+export DB_CQL_SLEEP_TIME="$CASSANDRA_CQL_SLEEP_TIME"
 export CASSANDRA_INIT_MAX_RETRIES="${CASSANDRA_INIT_MAX_RETRIES:-100}"
+export DB_INIT_MAX_RETRIES="$CASSANDRA_INIT_MAX_RETRIES"
 export CASSANDRA_INIT_SLEEP_TIME="${CASSANDRA_INIT_SLEEP_TIME:-5}"
+export DB_INIT_SLEEP_TIME="$CASSANDRA_INIT_SLEEP_TIME"
 export CASSANDRA_PEER_CQL_MAX_RETRIES="${CASSANDRA_PEER_CQL_MAX_RETRIES:-100}"
+export DB_PEER_CQL_MAX_RETRIES="$CASSANDRA_PEER_CQL_MAX_RETRIES"
 export CASSANDRA_PEER_CQL_SLEEP_TIME="${CASSANDRA_PEER_CQL_SLEEP_TIME:-10}"
-export CASSANDRA_DELAY_START_TIME="${CASSANDRA_DELAY_START_TIME:-0}"
+export DB_PEER_CQL_SLEEP_TIME="$CASSANDRA_PEER_CQL_SLEEP_TIME"
+export CASSANDRA_DELAY_START_TIME="${CASSANDRA_DELAY_START_TIME:-10}"
+export DB_DELAY_START_TIME="$CASSANDRA_DELAY_START_TIME"
 
 # Snapshot settings
 export CASSANDRA_AUTO_SNAPSHOT_TTL="${CASSANDRA_AUTO_SNAPSHOT_TTL:-30d}"
+export DB_AUTO_SNAPSHOT_TTL="$CASSANDRA_AUTO_SNAPSHOT_TTL"
 
 # Authentication, Authorization and Credentials
 export ALLOW_EMPTY_PASSWORD="${ALLOW_EMPTY_PASSWORD:-no}"
 export CASSANDRA_AUTHORIZER="${CASSANDRA_AUTHORIZER:-CassandraAuthorizer}"
+export DB_AUTHORIZER="$CASSANDRA_AUTHORIZER"
 export CASSANDRA_AUTHENTICATOR="${CASSANDRA_AUTHENTICATOR:-PasswordAuthenticator}"
+export DB_AUTHENTICATOR="$CASSANDRA_AUTHENTICATOR"
 export CASSANDRA_USER="${CASSANDRA_USER:-cassandra}"
+export DB_USER="$CASSANDRA_USER"
 export CASSANDRA_PASSWORD="${CASSANDRA_PASSWORD:-}"
+export DB_PASSWORD="$CASSANDRA_PASSWORD"
 export CASSANDRA_KEYSTORE_PASSWORD="${CASSANDRA_KEYSTORE_PASSWORD:-cassandra}"
+export DB_KEYSTORE_PASSWORD="$CASSANDRA_KEYSTORE_PASSWORD"
 export CASSANDRA_TRUSTSTORE_PASSWORD="${CASSANDRA_TRUSTSTORE_PASSWORD:-cassandra}"
-export CASSANDRA_KEYSTORE_LOCATION="${CASSANDRA_KEYSTORE_LOCATION:-${CASSANDRA_VOLUME_DIR}/secrets/keystore}"
-export CASSANDRA_TRUSTSTORE_LOCATION="${CASSANDRA_TRUSTSTORE_LOCATION:-${CASSANDRA_VOLUME_DIR}/secrets/truststore}"
-export CASSANDRA_TMP_P12_FILE="${CASSANDRA_TMP_DIR}/keystore.p12"
-export CASSANDRA_SSL_CERT_FILE="${CASSANDRA_VOLUME_DIR}/client.cer.pem"
+export DB_TRUSTSTORE_PASSWORD="$CASSANDRA_TRUSTSTORE_PASSWORD"
+export CASSANDRA_KEYSTORE_LOCATION="${CASSANDRA_KEYSTORE_LOCATION:-${DB_VOLUME_DIR}/secrets/keystore}"
+export DB_KEYSTORE_LOCATION="$CASSANDRA_KEYSTORE_LOCATION"
+export CASSANDRA_TRUSTSTORE_LOCATION="${CASSANDRA_TRUSTSTORE_LOCATION:-${DB_VOLUME_DIR}/secrets/truststore}"
+export DB_TRUSTSTORE_LOCATION="$CASSANDRA_TRUSTSTORE_LOCATION"
+export CASSANDRA_TMP_P12_FILE="${CASSANDRA_TMP_P12_FILE:-${DB_TMP_DIR}/keystore.p12}"
+export DB_TMP_P12_FILE="$CASSANDRA_TMP_P12_FILE"
+export CASSANDRA_SSL_CERT_FILE="${CASSANDRA_SSL_CERT_FILE:-${DB_VOLUME_DIR}/client.cer.pem}"
+export DB_SSL_CERT_FILE="$CASSANDRA_SSL_CERT_FILE"
 export SSL_CERTFILE="$CASSANDRA_SSL_CERT_FILE"
 export CASSANDRA_SSL_VALIDATE="${CASSANDRA_SSL_VALIDATE:-false}"
+export DB_SSL_VALIDATE="$CASSANDRA_SSL_VALIDATE"
 export SSL_VALIDATE="$CASSANDRA_SSL_VALIDATE"
 
 # cqlsh settings
diff --git a/bitnami/cassandra/4.1/debian-12/rootfs/opt/bitnami/scripts/cassandra/entrypoint.sh b/bitnami/cassandra/4.1/debian-12/rootfs/opt/bitnami/scripts/cassandra/entrypoint.sh
index 8904b32f82a6..da37e4e4dd15 100755
--- a/bitnami/cassandra/4.1/debian-12/rootfs/opt/bitnami/scripts/cassandra/entrypoint.sh
+++ b/bitnami/cassandra/4.1/debian-12/rootfs/opt/bitnami/scripts/cassandra/entrypoint.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright VMware, Inc.
+# Copyright Broadcom, Inc. All Rights Reserved.
 # SPDX-License-Identifier: APACHE-2.0
 
 # shellcheck disable=SC1091
@@ -18,9 +18,9 @@ set -o pipefail
 
 print_welcome_page
 
-if is_positive_int "$CASSANDRA_DELAY_START_TIME" && [[ "$CASSANDRA_DELAY_START_TIME" -gt 0 ]]; then
-    info "** Delaying Cassandra start by ${CASSANDRA_DELAY_START_TIME} seconds **"
-    sleep "$CASSANDRA_DELAY_START_TIME"
+if is_positive_int "$DB_DELAY_START_TIME" && [[ "$DB_DELAY_START_TIME" -gt 0 ]]; then
+    info "** Delaying Cassandra start by ${DB_DELAY_START_TIME} seconds **"
+    sleep "$DB_DELAY_START_TIME"
 fi
 
 if [[ "$*" = *"/opt/bitnami/scripts/cassandra/run.sh"* || "$*" = *"/run.sh"* ]]; then
diff --git a/bitnami/cassandra/4.1/debian-12/rootfs/opt/bitnami/scripts/cassandra/postunpack.sh b/bitnami/cassandra/4.1/debian-12/rootfs/opt/bitnami/scripts/cassandra/postunpack.sh
index e50106d39d23..d48e6fe856bd 100755
--- a/bitnami/cassandra/4.1/debian-12/rootfs/opt/bitnami/scripts/cassandra/postunpack.sh
+++ b/bitnami/cassandra/4.1/debian-12/rootfs/opt/bitnami/scripts/cassandra/postunpack.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright VMware, Inc.
+# Copyright Broadcom, Inc. All Rights Reserved.
 # SPDX-License-Identifier: APACHE-2.0
 
 # shellcheck disable=SC1091
@@ -12,23 +12,23 @@
 . /opt/bitnami/scripts/cassandra-env.sh
 
 
-for dir in "$CASSANDRA_INITSCRIPTS_DIR" "$CASSANDRA_TMP_DIR" "$CASSANDRA_LOG_DIR" "$CASSANDRA_MOUNTED_CONF_DIR" "$CASSANDRA_VOLUME_DIR"; do
+for dir in "$DB_INITSCRIPTS_DIR" "$DB_TMP_DIR" "$DB_LOG_DIR" "$DB_MOUNTED_CONF_DIR" "$DB_VOLUME_DIR"; do
     ensure_dir_exists "$dir"
     chmod -R g+rwX "$dir"
 done
 
 # Copy configuration files for the scripts to work
-ensure_dir_exists "$CASSANDRA_CONF_DIR"
+ensure_dir_exists "$DB_CONF_DIR"
 cassandra_copy_default_config
-chmod -R g+rwX "$CASSANDRA_CONF_DIR"
+chmod -R g+rwX "$DB_CONF_DIR"
 
 # Create wrapper for cqlsh
-cat <<EOF >"${CASSANDRA_BIN_DIR}/cqlsh"
+cat <<EOF >"${DB_BIN_DIR}/cqlsh"
 #!/bin/sh
-exec "${PYTHON_BIN_DIR}/python" "${CASSANDRA_BIN_DIR}/cqlsh.py" "\$@"
+exec "${PYTHON_BIN_DIR}/python" "${DB_BIN_DIR}/cqlsh.py" "\$@"
 EOF
 
-chmod +x "${CASSANDRA_BIN_DIR}/cqlsh"
+chmod +x "${DB_BIN_DIR}/cqlsh"
 
 ensure_dir_exists "${HOME}/.cassandra"
 chmod -R g+rwX "${HOME}/.cassandra"
diff --git a/bitnami/cassandra/4.1/debian-12/rootfs/opt/bitnami/scripts/cassandra/run.sh b/bitnami/cassandra/4.1/debian-12/rootfs/opt/bitnami/scripts/cassandra/run.sh
index c09caa5602ed..b3f222c3661c 100755
--- a/bitnami/cassandra/4.1/debian-12/rootfs/opt/bitnami/scripts/cassandra/run.sh
+++ b/bitnami/cassandra/4.1/debian-12/rootfs/opt/bitnami/scripts/cassandra/run.sh
@@ -34,14 +34,14 @@ info "** Starting Cassandra **"
 #
 # If none of the two cases apply, we assume it is an error and exit
 if is_cassandra_running; then
-    __run_pid="$(get_pid_from_file "$CASSANDRA_PID_FILE")"
+    __run_pid="$(get_pid_from_file "$DB_PID_FILE")"
     running_log_file=""
 
-    if [[ -f "$CASSANDRA_FIRST_BOOT_LOG_FILE" ]]; then
-        running_log_file="$CASSANDRA_FIRST_BOOT_LOG_FILE"
+    if [[ -f "$DB_FIRST_BOOT_LOG_FILE" ]]; then
+        running_log_file="$DB_FIRST_BOOT_LOG_FILE"
         info "Cassandra already running with PID $__run_pid because of the initial cluster setup"
-    elif [[ -f "$CASSANDRA_INITSCRIPTS_BOOT_LOG_FILE" ]]; then
-        running_log_file="$CASSANDRA_INITSCRIPTS_BOOT_LOG_FILE"
+    elif [[ -f "$DB_INITSCRIPTS_BOOT_LOG_FILE" ]]; then
+        running_log_file="$DB_INITSCRIPTS_BOOT_LOG_FILE"
         info "Cassandra already running PID $__run_pid because of the init scripts execution"
     else
         error "Cassandra is already running for an unexpected reason. Exiting"
@@ -53,15 +53,15 @@ if is_cassandra_running; then
     readonly __run_tail_flags=("--pid=${__run_pid}" "-n" "1000" "-f" "$running_log_file")
 
     if am_i_root; then
-        exec_as_user "$CASSANDRA_DAEMON_USER" "${__run_tail_cmd}" "${__run_tail_flags[@]}"
+        exec_as_user "$DB_DAEMON_USER" "${__run_tail_cmd}" "${__run_tail_flags[@]}"
     else
         exec "${__run_tail_cmd}" "${__run_tail_flags[@]}"
     fi
 else
-    readonly __run_cmd="${CASSANDRA_BIN_DIR}/cassandra"
-    readonly __run_flags=("-p $CASSANDRA_PID_FILE" "-R" "-f")
+    readonly __run_cmd="${DB_BIN_DIR}/cassandra"
+    readonly __run_flags=("-p $DB_PID_FILE" "-R" "-f")
     if am_i_root; then
-        exec_as_user "$CASSANDRA_DAEMON_USER" "${__run_cmd}" "${__run_flags[@]}"
+        exec_as_user "$DB_DAEMON_USER" "${__run_cmd}" "${__run_flags[@]}"
     else
         exec "${__run_cmd}" "${__run_flags[@]}"
     fi
diff --git a/bitnami/cassandra/4.1/debian-12/rootfs/opt/bitnami/scripts/cassandra/setup.sh b/bitnami/cassandra/4.1/debian-12/rootfs/opt/bitnami/scripts/cassandra/setup.sh
index 325b9473326e..5edebf92b826 100755
--- a/bitnami/cassandra/4.1/debian-12/rootfs/opt/bitnami/scripts/cassandra/setup.sh
+++ b/bitnami/cassandra/4.1/debian-12/rootfs/opt/bitnami/scripts/cassandra/setup.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright VMware, Inc.
+# Copyright Broadcom, Inc. All Rights Reserved.
 # SPDX-License-Identifier: APACHE-2.0
 #
 # Bitnami Cassandra setup
@@ -23,11 +23,11 @@ cassandra_set_default_host
 # Ensure Cassandra environment variables settings are valid
 cassandra_validate
 # Ensure 'daemon' user exists when running as 'root'
-am_i_root && ensure_user_exists "$CASSANDRA_DAEMON_USER" --group "$CASSANDRA_DAEMON_GROUP"
+am_i_root && ensure_user_exists "$DB_DAEMON_USER" --group "$DB_DAEMON_GROUP"
 # Ensure Cassandra is initialized
 cassandra_initialize
 
 # Allow running custom initialization scripts
-if ! is_boolean_yes "$CASSANDRA_IGNORE_INITDB_SCRIPTS"; then
+if ! is_boolean_yes "$DB_IGNORE_INITDB_SCRIPTS"; then
     cassandra_custom_init_scripts
 fi
diff --git a/bitnami/cassandra/4.1/debian-12/rootfs/opt/bitnami/scripts/java/entrypoint.sh b/bitnami/cassandra/4.1/debian-12/rootfs/opt/bitnami/scripts/java/entrypoint.sh
index c3a1e2383fa1..8557631d2549 100755
--- a/bitnami/cassandra/4.1/debian-12/rootfs/opt/bitnami/scripts/java/entrypoint.sh
+++ b/bitnami/cassandra/4.1/debian-12/rootfs/opt/bitnami/scripts/java/entrypoint.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright VMware, Inc.
+# Copyright Broadcom, Inc. All Rights Reserved.
 # SPDX-License-Identifier: APACHE-2.0
 
 # shellcheck disable=SC1091
diff --git a/bitnami/cassandra/4.1/debian-12/rootfs/opt/bitnami/scripts/java/postunpack.sh b/bitnami/cassandra/4.1/debian-12/rootfs/opt/bitnami/scripts/java/postunpack.sh
index 52dbf4f13673..c15af32e2f77 100755
--- a/bitnami/cassandra/4.1/debian-12/rootfs/opt/bitnami/scripts/java/postunpack.sh
+++ b/bitnami/cassandra/4.1/debian-12/rootfs/opt/bitnami/scripts/java/postunpack.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright VMware, Inc.
+# Copyright Broadcom, Inc. All Rights Reserved.
 # SPDX-License-Identifier: APACHE-2.0
 
 # shellcheck disable=SC1091
diff --git a/bitnami/cassandra/4.1/debian-12/rootfs/opt/bitnami/scripts/libcassandra.sh b/bitnami/cassandra/4.1/debian-12/rootfs/opt/bitnami/scripts/libcassandra.sh
index 57c6f8441cfd..9fc95ea87a93 100644
--- a/bitnami/cassandra/4.1/debian-12/rootfs/opt/bitnami/scripts/libcassandra.sh
+++ b/bitnami/cassandra/4.1/debian-12/rootfs/opt/bitnami/scripts/libcassandra.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright VMware, Inc.
+# Copyright Broadcom, Inc. All Rights Reserved.
 # SPDX-License-Identifier: APACHE-2.0
 #
 # Bitnami Cassandra library
diff --git a/bitnami/cassandra/README.md b/bitnami/cassandra/README.md
index f034c6569ba1..1c0452ccdc9e 100644
--- a/bitnami/cassandra/README.md
+++ b/bitnami/cassandra/README.md
@@ -164,80 +164,80 @@ docker-compose up -d
 
 #### Customizable environment variables
 
-| Name                                               | Description                                                                             | Default Value                                |
-|----------------------------------------------------|-----------------------------------------------------------------------------------------|----------------------------------------------|
-| `CASSANDRA_VOLUME_DIR`                             | Cassandra persistence directory.                                                        | `/bitnami/cassandra`                         |
-| `CASSANDRA_DATA_DIR`                               | Cassandra directory where data is stored.                                               | `${CASSANDRA_VOLUME_DIR}/data`               |
-| `CASSANDRA_COMMITLOG_DIR`                          | Cassandra commit log directory.                                                         | `${CASSANDRA_DATA_DIR}/commitlog`            |
-| `CASSANDRA_MOUNTED_CONF_DIR`                       | Cassandra directory for mounted configuration files.                                    | `${CASSANDRA_VOLUME_DIR}/conf`               |
-| `CASSANDRA_CLIENT_ENCRYPTION`                      | Enable client encryption.                                                               | `false`                                      |
-| `CASSANDRA_CLUSTER_NAME`                           | Cassandra cluster name.                                                                 | `My Cluster`                                 |
-| `CASSANDRA_DATACENTER`                             | Cassandra datacenter name.                                                              | `dc1`                                        |
-| `CASSANDRA_ENABLE_REMOTE_CONNECTIONS`              | Enable connection from remote locations.                                                | `true`                                       |
-| `CASSANDRA_ENABLE_RPC`                             | Enable RPC endpoint in Cassandra.                                                       | `true`                                       |
-| `CASSANDRA_ENABLE_USER_DEFINED_FUNCTIONS`          | Enable user defined functions.                                                          | `false`                                      |
-| `CASSANDRA_ENABLE_SCRIPTED_USER_DEFINED_FUNCTIONS` | Enable scripted user defined functions.                                                 | `false`                                      |
-| `CASSANDRA_ENDPOINT_SNITCH`                        | Name of the cluster endpoint snitch.                                                    | `SimpleSnitch`                               |
-| `CASSANDRA_HOST`                                   | Cassandra host name.                                                                    | `nil`                                        |
-| `CASSANDRA_INTERNODE_ENCRYPTION`                   | Internode encryption type.                                                              | `none`                                       |
-| `CASSANDRA_NUM_TOKENS`                             | Number of tokens in cluster connection.                                                 | `256`                                        |
-| `CASSANDRA_PASSWORD_SEEDER`                        | Set the node as password seeder in the clustre.                                         | `no`                                         |
-| `CASSANDRA_SEEDS`                                  | List of cluster seeds.                                                                  | `$CASSANDRA_HOST`                            |
-| `CASSANDRA_PEERS`                                  | List of cluster peers.                                                                  | `$CASSANDRA_SEEDS`                           |
-| `CASSANDRA_PEERS`                                  | List of cluster peers.                                                                  | `$CASSANDRA_SEEDS`                           |
-| `CASSANDRA_NODES`                                  | List of cluster nodes (seeders and non seeders)                                         | `nil`                                        |
-| `CASSANDRA_RACK`                                   | Cassandra rack name.                                                                    | `rack1`                                      |
-| `CASSANDRA_BROADCAST_ADDRESS`                      | Node broadcast address.                                                                 | `nil`                                        |
-| `CASSANDRA_AUTOMATIC_SSTABLE_UPGRADE`              | Automatically upgrade sstables after upgrade.                                           | `false`                                      |
-| `CASSANDRA_STARTUP_CQL`                            | Startup CQL commands to run at boot.                                                    | `nil`                                        |
-| `CASSANDRA_IGNORE_INITDB_SCRIPTS`                  | Ignore the execution of init scripts                                                    | `no`                                         |
-| `CASSANDRA_CQL_PORT_NUMBER`                        | CQL port.                                                                               | `9042`                                       |
-| `CASSANDRA_JMX_PORT_NUMBER`                        | JMX port.                                                                               | `7199`                                       |
-| `CASSANDRA_TRANSPORT_PORT_NUMBER`                  | Transport port.                                                                         | `7000`                                       |
-| `CASSANDRA_CQL_MAX_RETRIES`                        | Maximum retries for CQL startup operations.                                             | `20`                                         |
-| `CASSANDRA_CQL_SLEEP_TIME`                         | Sleep time for CQL startup operations.                                                  | `5`                                          |
-| `CASSANDRA_INIT_MAX_RETRIES`                       | Maximum retries for init startup operations.                                            | `100`                                        |
-| `CASSANDRA_INIT_SLEEP_TIME`                        | Sleep time for init startup operations.                                                 | `5`                                          |
-| `CASSANDRA_PEER_CQL_MAX_RETRIES`                   | Maximum retries for peer startup operations.                                            | `100`                                        |
-| `CASSANDRA_PEER_CQL_SLEEP_TIME`                    | Sleep time for peer startup operations.                                                 | `10`                                         |
-| `CASSANDRA_DELAY_START_TIME`                       | Delay Cassandra start by the number of provided seconds.                                | `0`                                          |
-| `CASSANDRA_AUTO_SNAPSHOT_TTL`                      | Take an automatic snapshot of the data before truncating a keyspace or dropping a table | `30d`                                        |
-| `ALLOW_EMPTY_PASSWORD`                             | Allow no credentials in the installation.                                               | `no`                                         |
-| `CASSANDRA_AUTHORIZER`                             | Cassandra connection authorizer.                                                        | `CassandraAuthorizer`                        |
-| `CASSANDRA_AUTHENTICATOR`                          | Cassandra connection authenticator.                                                     | `PasswordAuthenticator`                      |
-| `CASSANDRA_USER`                                   | Cassandra username.                                                                     | `cassandra`                                  |
-| `CASSANDRA_PASSWORD`                               | Cassandra password.                                                                     | `nil`                                        |
-| `CASSANDRA_KEYSTORE_PASSWORD`                      | Cassandra keystore password.                                                            | `cassandra`                                  |
-| `CASSANDRA_TRUSTSTORE_PASSWORD`                    | Cassandra truststore password.                                                          | `cassandra`                                  |
-| `CASSANDRA_KEYSTORE_LOCATION`                      | Cassandra keystore location.                                                            | `${CASSANDRA_VOLUME_DIR}/secrets/keystore`   |
-| `CASSANDRA_TRUSTSTORE_LOCATION`                    | Cassandra truststore location.                                                          | `${CASSANDRA_VOLUME_DIR}/secrets/truststore` |
-| `CASSANDRA_SSL_VALIDATE`                           | Perform SSL validation on the certificates.                                             | `false`                                      |
-| `SSL_VERSION`                                      | TLS version to use when connecting.                                                     | `TLSv1_2`                                    |
+| Name                                               | Description                                                                             | Default Value                         |
+|----------------------------------------------------|-----------------------------------------------------------------------------------------|---------------------------------------|
+| `CASSANDRA_MOUNTED_CONF_DIR`                       | Cassandra directory for mounted configuration files                                     | `${DB_VOLUME_DIR}/conf`               |
+| `CASSANDRA_CLIENT_ENCRYPTION`                      | Enable client encryption                                                                | `false`                               |
+| `CASSANDRA_CLUSTER_NAME`                           | Cassandra cluster name                                                                  | `My Cluster`                          |
+| `CASSANDRA_DATACENTER`                             | Cassandra datacenter name                                                               | `dc1`                                 |
+| `CASSANDRA_ENABLE_REMOTE_CONNECTIONS`              | Enable connection from remote locations                                                 | `true`                                |
+| `CASSANDRA_ENABLE_RPC`                             | Enable RPC endpoint in Cassandra                                                        | `false`                               |
+| `CASSANDRA_ENABLE_USER_DEFINED_FUNCTIONS`          | Enable user defined functions                                                           | `false`                               |
+| `CASSANDRA_ENABLE_SCRIPTED_USER_DEFINED_FUNCTIONS` | Enable scripted user defined functions                                                  | `false`                               |
+| `CASSANDRA_ENDPOINT_SNITCH`                        | Name of the cluster endpoint snitch                                                     | `SimpleSnitch`                        |
+| `CASSANDRA_HOST`                                   | Cassandra host name                                                                     | `nil`                                 |
+| `CASSANDRA_INTERNODE_ENCRYPTION`                   | Internode encryption type                                                               | `none`                                |
+| `CASSANDRA_NUM_TOKENS`                             | Number of tokens in cluster connection                                                  | `256`                                 |
+| `CASSANDRA_PASSWORD_SEEDER`                        | Set node as password seeder in the cluster                                              | `no`                                  |
+| `CASSANDRA_SEEDS`                                  | List of cluster seeds                                                                   | `$DB_HOST`                            |
+| `CASSANDRA_PEERS`                                  | List of cluster peers                                                                   | `$DB_SEEDS`                           |
+| `CASSANDRA_NODES`                                  | List of cluster nodes (seeders and non seeders)                                         | `nil`                                 |
+| `CASSANDRA_RACK`                                   | Cassandra rack name                                                                     | `rack1`                               |
+| `CASSANDRA_BROADCAST_ADDRESS`                      | Node broadcast address                                                                  | `nil`                                 |
+| `CASSANDRA_AUTOMATIC_SSTABLE_UPGRADE`              | Automatically upgrade sstables after upgrade                                            | `false`                               |
+| `CASSANDRA_STARTUP_CQL`                            | Startup CQL commands to run at boot                                                     | `nil`                                 |
+| `CASSANDRA_IGNORE_INITDB_SCRIPTS`                  | Ignore the execution of init scripts                                                    | `no`                                  |
+| `CASSANDRA_CQL_PORT_NUMBER`                        | CQL port                                                                                | `9042`                                |
+| `CASSANDRA_JMX_PORT_NUMBER`                        | JMX port                                                                                | `7199`                                |
+| `CASSANDRA_TRANSPORT_PORT_NUMBER`                  | Transport port                                                                          | `7000`                                |
+| `CASSANDRA_CQL_MAX_RETRIES`                        | Maximum retries for CQL startup operations                                              | `20`                                  |
+| `CASSANDRA_CQL_SLEEP_TIME`                         | Sleep time for CQL startup operations                                                   | `5`                                   |
+| `CASSANDRA_INIT_MAX_RETRIES`                       | Maximum retries for init startup operations                                             | `100`                                 |
+| `CASSANDRA_INIT_SLEEP_TIME`                        | Sleep time for init startup operations                                                  | `5`                                   |
+| `CASSANDRA_PEER_CQL_MAX_RETRIES`                   | Maximum retries for peer startup operations                                             | `100`                                 |
+| `CASSANDRA_PEER_CQL_SLEEP_TIME`                    | Sleep time for peer startup operations                                                  | `10`                                  |
+| `CASSANDRA_DELAY_START_TIME`                       | Delay Cassandra start by the number of provided seconds                                 | `10`                                  |
+| `CASSANDRA_AUTO_SNAPSHOT_TTL`                      | Take an automatic snapshot of the data before truncating a keyspace or dropping a table | `30d`                                 |
+| `ALLOW_EMPTY_PASSWORD`                             | Allow no credentials in the installation.                                               | `no`                                  |
+| `CASSANDRA_AUTHORIZER`                             | Cassandra connection authorizer                                                         | `CassandraAuthorizer`                 |
+| `CASSANDRA_AUTHENTICATOR`                          | Cassandra connection authenticator                                                      | `PasswordAuthenticator`               |
+| `CASSANDRA_USER`                                   | Cassandra username                                                                      | `cassandra`                           |
+| `CASSANDRA_PASSWORD`                               | Cassandra password                                                                      | `nil`                                 |
+| `CASSANDRA_KEYSTORE_PASSWORD`                      | Cassandra keystore password                                                             | `cassandra`                           |
+| `CASSANDRA_TRUSTSTORE_PASSWORD`                    | Cassandra truststore password                                                           | `cassandra`                           |
+| `CASSANDRA_KEYSTORE_LOCATION`                      | Cassandra keystore location                                                             | `${DB_VOLUME_DIR}/secrets/keystore`   |
+| `CASSANDRA_TRUSTSTORE_LOCATION`                    | Cassandra truststore location                                                           | `${DB_VOLUME_DIR}/secrets/truststore` |
+| `CASSANDRA_TMP_P12_FILE`                           | Cassandra truststore location                                                           | `${DB_TMP_DIR}/keystore.p12`          |
+| `CASSANDRA_SSL_CERT_FILE`                          | Cassandra SSL certificate location                                                      | `${DB_VOLUME_DIR}/client.cer.pem`     |
+| `CASSANDRA_SSL_VALIDATE`                           | Perform SSL validation on the certificates                                              | `false`                               |
+| `SSL_VERSION`                                      | TLS version to use when connecting.                                                     | `TLSv1_2`                             |
 
 #### Read-only environment variables
 
-| Name                                  | Description                                | Value                                                  |
-|---------------------------------------|--------------------------------------------|--------------------------------------------------------|
-| `CASSANDRA_BASE_DIR`                  | Cassandra installation directory.          | `${BITNAMI_ROOT_DIR}/cassandra`                        |
-| `CASSANDRA_BIN_DIR`                   | Cassandra binary directory.                | `${CASSANDRA_BASE_DIR}/bin`                            |
-| `CASSANDRA_CONF_DIR`                  | Cassandra configuration directory.         | `${CASSANDRA_BASE_DIR}/conf`                           |
-| `CASSANDRA_DEFAULT_CONF_DIR`          | Cassandra configuration directory.         | `${CASSANDRA_BASE_DIR}/conf.default`                   |
-| `CASSANDRA_INITSCRIPTS_DIR`           | Cassandra directory for init scripts.      | `/docker-entrypoint-initdb.d`                          |
-| `CASSANDRA_LOG_DIR`                   | Cassandra directory for logs.              | `${CASSANDRA_BASE_DIR}/logs`                           |
-| `CASSANDRA_TMP_DIR`                   | Cassandra directory for temporary files.   | `${CASSANDRA_BASE_DIR}/tmp`                            |
-| `JAVA_BASE_DIR`                       | Java base directory.                       | `${BITNAMI_ROOT_DIR}/java`                             |
-| `JAVA_BIN_DIR`                        | Java binary directory.                     | `${JAVA_BASE_DIR}/bin`                                 |
-| `PYTHON_BASE_DIR`                     | Python base directory.                     | `${BITNAMI_ROOT_DIR}/python`                           |
-| `PYTHON_BIN_DIR`                      | Python binary directory.                   | `${PYTHON_BASE_DIR}/bin`                               |
-| `CASSANDRA_CONF_FILE`                 | Path to the Cassandra configuration file.  | `${CASSANDRA_CONF_DIR}/cassandra.yaml`                 |
-| `CASSANDRA_LOG_FILE`                  | Path to the Cassandra log file.            | `${CASSANDRA_LOG_DIR}/cassandra.log`                   |
-| `CASSANDRA_FIRST_BOOT_LOG_FILE`       | Path to the Cassandra first boot log file. | `${CASSANDRA_LOG_DIR}/cassandra_first_boot.log`        |
-| `CASSANDRA_INITSCRIPTS_BOOT_LOG_FILE` | Path to the Cassandra first boot log file. | `${CASSANDRA_LOG_DIR}/cassandra_init_scripts_boot.log` |
-| `CASSANDRA_PID_FILE`                  | Path to the PID file for Cassandra.        | `${CASSANDRA_TMP_DIR}/cassandra.pid`                   |
-| `CASSANDRA_DAEMON_USER`               | Cassandra system user.                     | `cassandra`                                            |
-| `CASSANDRA_DAEMON_GROUP`              | Cassandra system group.                    | `cassandra`                                            |
-| `CASSANDRA_TMP_P12_FILE`              | Cassandra temporary p12 file location.     | `${CASSANDRA_TMP_DIR}/keystore.p12`                    |
-| `CASSANDRA_SSL_CERT_FILE`             | Cassandra SSL certificate location.        | `${CASSANDRA_VOLUME_DIR}/client.cer.pem`               |
+| Name                                  | Description                                               | Value                                           |
+|---------------------------------------|-----------------------------------------------------------|-------------------------------------------------|
+| `DB_FLAVOR`                           | Database flavor. Valid values: `cassandra` or `scylladb`. | `cassandra`                                     |
+| `CASSANDRA_BASE_DIR`                  | Cassandra installation directory                          | `/opt/bitnami/cassandra`                        |
+| `CASSANDRA_BIN_DIR`                   | Cassandra executables directory                           | `${DB_BASE_DIR}/bin`                            |
+| `CASSANDRA_CONF_DIR`                  | Cassandra configuration directory                         | `${DB_BASE_DIR}/conf`                           |
+| `CASSANDRA_VOLUME_DIR`                | Persistence base directory                                | `/bitnami/cassandra`                            |
+| `CASSANDRA_DATA_DIR`                  | Cassandra data directory                                  | `${DB_VOLUME_DIR}/data`                         |
+| `CASSANDRA_COMMITLOG_DIR`             | Cassandra commit log directory                            | `${DB_DATA_DIR}/commitlog`                      |
+| `CASSANDRA_DEFAULT_CONF_DIR`          | Cassandra default configuration directory                 | `${DB_BASE_DIR}/conf.default`                   |
+| `CASSANDRA_INITSCRIPTS_DIR`           | Path to the Cassandra container init scripts directory    | `/docker-entrypoint-initdb.d`                   |
+| `CASSANDRA_LOG_DIR`                   | Cassandra logs directory                                  | `${DB_BASE_DIR}/logs`                           |
+| `CASSANDRA_TMP_DIR`                   | Cassandra temporary directory                             | `${DB_BASE_DIR}/tmp`                            |
+| `JAVA_BASE_DIR`                       | Java base directory                                       | `${BITNAMI_ROOT_DIR}/java`                      |
+| `JAVA_BIN_DIR`                        | Java binary directory                                     | `${JAVA_BASE_DIR}/bin`                          |
+| `PYTHON_BASE_DIR`                     | Python base directory                                     | `${BITNAMI_ROOT_DIR}/python`                    |
+| `PYTHON_BIN_DIR`                      | Python binary directory                                   | `${PYTHON_BASE_DIR}/bin`                        |
+| `CASSANDRA_CONF_FILE`                 | Path to Cassandra configuration file                      | `${DB_CONF_DIR}/cassandra.yaml`                 |
+| `CASSANDRA_LOG_FILE`                  | Path to the Cassandra log file                            | `${DB_LOG_DIR}/cassandra.log`                   |
+| `CASSANDRA_FIRST_BOOT_LOG_FILE`       | Path to the Cassandra first boot log file                 | `${DB_LOG_DIR}/cassandra_first_boot.log`        |
+| `CASSANDRA_INITSCRIPTS_BOOT_LOG_FILE` | Path to the Cassandra init scripts log file               | `${DB_LOG_DIR}/cassandra_init_scripts_boot.log` |
+| `CASSANDRA_PID_FILE`                  | Path to the Cassandra pid file                            | `${DB_TMP_DIR}/cassandra.pid`                   |
+| `CASSANDRA_DAEMON_USER`               | Cassandra system user                                     | `cassandra`                                     |
+| `CASSANDRA_DAEMON_GROUP`              | Cassandra system group                                    | `cassandra`                                     |
 
 Additionally, any environment variable beginning with the following prefix will be mapped to its corresponding Apache Cassandra key in the proper file:
 
diff --git a/bitnami/cassandra/docker-compose-cluster.yml b/bitnami/cassandra/docker-compose-cluster.yml
index 9b03ed369f5c..e772909726de 100644
--- a/bitnami/cassandra/docker-compose-cluster.yml
+++ b/bitnami/cassandra/docker-compose-cluster.yml
@@ -1,4 +1,4 @@
-# Copyright VMware, Inc.
+# Copyright Broadcom, Inc. All Rights Reserved.
 # SPDX-License-Identifier: APACHE-2.0
 
 version: '2'
diff --git a/bitnami/cassandra/docker-compose.yml b/bitnami/cassandra/docker-compose.yml
index af3d31b2f806..134ec313c186 100644
--- a/bitnami/cassandra/docker-compose.yml
+++ b/bitnami/cassandra/docker-compose.yml
@@ -1,4 +1,4 @@
-# Copyright VMware, Inc.
+# Copyright Broadcom, Inc. All Rights Reserved.
 # SPDX-License-Identifier: APACHE-2.0
 
 version: '2'