diff --git a/bitnami/valkey/9.1/debian-12/Dockerfile b/bitnami/valkey/9.1/debian-12/Dockerfile
index 4899cb1ba5f7..a8317e98f49c 100644
--- a/bitnami/valkey/9.1/debian-12/Dockerfile
+++ b/bitnami/valkey/9.1/debian-12/Dockerfile
@@ -7,7 +7,7 @@ ARG DOWNLOADS_URL="downloads.bitnami.com/files/stacksmith"
 ARG TARGETARCH
 
 LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
-      org.opencontainers.image.created="2026-05-23T12:15:00Z" \
+      org.opencontainers.image.created="2026-06-05T15:11:35Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/valkey/README.md" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/valkey" \
@@ -28,18 +28,18 @@ RUN --mount=type=secret,id=downloads_url,env=SECRET_DOWNLOADS_URL \
     DOWNLOADS_URL=${SECRET_DOWNLOADS_URL:-${DOWNLOADS_URL}} ; \
     mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \
     COMPONENTS=( \
-      "wait-for-port-1.0.10-10-linux-${OS_ARCH}-debian-12" \
+      "wait-for-port-1.0.10-11-linux-${OS_ARCH}-debian-12" \
       "valkey-9.1.0-1-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
         curl -SsLf "https://${DOWNLOADS_URL}/${COMPONENT}.tar.gz" -O ; \
-        curl -SsLf "https://${DOWNLOADS_URL}/${COMPONENT}.tar.gz.sha256" -O ; \
       fi ; \
-      sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \
+      sha256sum -c "/opt/bitnami/checksums/${COMPONENT}.tar.gz.sha256" ; \
       tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner ; \
-      rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \
-    done
+      rm -rf "${COMPONENT}".tar.gz ; \
+    done ; \
+    rm -rf /opt/bitnami/checksums ;
 RUN apt-get update && apt-get upgrade -y && \
     apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives
 RUN chmod g+rwX /opt/bitnami
@@ -52,7 +52,7 @@ COPY rootfs /
 RUN /opt/bitnami/scripts/valkey/postunpack.sh
 ENV APP_VERSION="9.1.0" \
     BITNAMI_APP_NAME="valkey" \
-    IMAGE_REVISION="2" \
+    IMAGE_REVISION="3" \
     PATH="/opt/bitnami/common/bin:/opt/bitnami/valkey/bin:$PATH"
 
 EXPOSE 6379
diff --git a/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/checksums/valkey-9.1.0-1-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/checksums/valkey-9.1.0-1-linux-amd64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..ee2aaba141a8
--- /dev/null
+++ b/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/checksums/valkey-9.1.0-1-linux-amd64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+9bbf3d19f5add4023e17213577425d73627a3806f8a17109b8b876ff5a136879  valkey-9.1.0-1-linux-amd64-debian-12.tar.gz
diff --git a/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/checksums/valkey-9.1.0-1-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/checksums/valkey-9.1.0-1-linux-arm64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..542398f966f5
--- /dev/null
+++ b/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/checksums/valkey-9.1.0-1-linux-arm64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+b010e1fcc6c898cb07b8bde299ce45b3a70aedf06868d51676d2081d99aff305  valkey-9.1.0-1-linux-arm64-debian-12.tar.gz
diff --git a/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/checksums/wait-for-port-1.0.10-11-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/checksums/wait-for-port-1.0.10-11-linux-amd64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..ab86dab7c5d1
--- /dev/null
+++ b/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/checksums/wait-for-port-1.0.10-11-linux-amd64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+b8a9cd842e95ae16de5bbf157cc7e246c79a24d3b5b626bcce32f6904a895383  wait-for-port-1.0.10-11-linux-amd64-debian-12.tar.gz
diff --git a/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/checksums/wait-for-port-1.0.10-11-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/checksums/wait-for-port-1.0.10-11-linux-arm64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..3799475af672
--- /dev/null
+++ b/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/checksums/wait-for-port-1.0.10-11-linux-arm64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+ae2e822f8c673eb66a2cadbc6dc5fe9c8c0791564751e453a04a416ab9bd6f61  wait-for-port-1.0.10-11-linux-arm64-debian-12.tar.gz
diff --git a/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/scripts/libfile.sh b/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/scripts/libfile.sh
index 1c69e0e48a5d..335c1c7c9ef7 100644
--- a/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/scripts/libfile.sh
+++ b/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/scripts/libfile.sh
@@ -139,3 +139,40 @@ wait_for_log_entry() {
         return 1
     fi
 }
+
+########################
+# Creates a secure temporary file containing the provided secret
+# Arguments:
+#   $1 - secret to write to the temporary file
+# Returns:
+#   String
+#########################
+credential_to_temp_file() {
+    local secret="$1"
+    local tmp_file
+
+    # Use mktemp with a specific prefix for easier debugging if something lingers
+    if ! tmp_file=$(mktemp "${TMPDIR:-/tmp}/at.cred.XXXXXXXX"); then
+        echo "Error: Failed to create temp file" >&2
+        return 1
+    fi
+
+    # Restrict permissions before writing the secret
+    chmod 0600 "$tmp_file"
+    # Write secret and ensure it's flushed to disk
+    printf "%s" "$secret" > "$tmp_file"
+    # Output the filename so the caller can capture it
+    echo "$tmp_file"
+}
+
+########################
+# Cleans up temporary files created by credential_to_temp_file
+# Arguments:
+#   None
+# Returns:
+#   None
+#########################
+cleanup_credentials() {
+    debug "Cleaning up temporary files containing credentials"
+    rm -rf "${TMPDIR:-/tmp}"/at.cred.*
+}
diff --git a/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/scripts/libfs.sh
index 1337f6c2dd59..b16efabd3230 100644
--- a/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/scripts/libfs.sh
+++ b/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/scripts/libfs.sh
@@ -131,6 +131,7 @@ relativize() {
 #   -d|--dir-mode - mode for files.
 #   -u|--user - user
 #   -g|--group - group
+#   -n|--no-dereference - do not follow symlinks (use for runtime root chown of daemon-writable dirs)
 # Returns:
 #   None
 #########################
@@ -140,6 +141,7 @@ configure_permissions_ownership() {
     local file_mode=""
     local user=""
     local group=""
+    local follow_symlinks="yes"
 
     # Validate arguments
     shift 1
@@ -161,6 +163,9 @@ configure_permissions_ownership() {
             shift
             group="${1:?missing group}"
             ;;
+        -n | --no-dereference)
+            follow_symlinks="no"
+            ;;
         *)
             echo "Invalid command line flag $1" >&2
             return 1
@@ -169,22 +174,29 @@ configure_permissions_ownership() {
         shift
     done
 
+    # -L: follow symlinks and emits the target path
+    # This is dangerous at runtime, given a co-located lower-privileged process with write access
+    # to the target path can redirect the chown/chmod to arbitrary paths. Example:
+    # Lower-privileged process run: ln -s /etc /tmp/etc
+    # Then, setup.sh runs: configure_permissions_ownership --dir-mode 775 /tmp
+    local find_L_flag=(); [[ "$follow_symlinks" == "yes" ]] && find_L_flag=("-L")
+    # -h: changes symlink inode ownership without touching the target.
+    local chown_flags=(); [[ "$follow_symlinks" == "no" ]] && chown_flags=("-h")
     read -r -a filepaths <<<"$paths"
     for p in "${filepaths[@]}"; do
         if [[ -e "$p" ]]; then
-            find -L "$p" -printf ""
             if [[ -n $dir_mode ]]; then
-                find -L "$p" -type d ! -perm "$dir_mode" -print0 | xargs -r -0 chmod "$dir_mode"
+                find "${find_L_flag[@]}" "$p" -not -type l -type d ! -perm "$dir_mode" -print0 | xargs -r -0 chmod "$dir_mode"
             fi
             if [[ -n $file_mode ]]; then
-                find -L "$p" -type f ! -perm "$file_mode" -print0 | xargs -r -0 chmod "$file_mode"
+                find "${find_L_flag[@]}" "$p" -not -type l -type f ! -perm "$file_mode" -print0 | xargs -r -0 chmod "$file_mode"
             fi
             if [[ -n $user ]] && [[ -n $group ]]; then
-                find -L "$p" -print0 | xargs -r -0 chown "${user}:${group}"
+                find "${find_L_flag[@]}" "$p" -print0 | xargs -r -0 chown "${chown_flags[@]}" "${user}:${group}"
             elif [[ -n $user ]] && [[ -z $group ]]; then
-                find -L "$p" -print0 | xargs -r -0 chown "${user}"
+                find "${find_L_flag[@]}" "$p" -print0 | xargs -r -0 chown "${chown_flags[@]}" "${user}"
             elif [[ -z $user ]] && [[ -n $group ]]; then
-                find -L "$p" -print0 | xargs -r -0 chgrp "${group}"
+                find "${find_L_flag[@]}" "$p" -print0 | xargs -r -0 chgrp "${chown_flags[@]}" "${group}"
             fi
         else
             stderr_print "$p does not exist"
diff --git a/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh
index 9d908c48579b..2d3c3bdb5f4a 100644
--- a/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh
+++ b/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh
@@ -170,7 +170,7 @@ ensure_user_exists() {
     if [[ -n "$home" ]]; then
         mkdir -p "$home"
         usermod -d "$home" "$user" >/dev/null 2>&1
-        configure_permissions_ownership "$home" -d "775" -f "664" -u "$user" -g "$group"
+        configure_permissions_ownership "$home" -d "775" -f "664" -u "$user" -g "$group" -n
     fi
 }
 
diff --git a/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh
index bbd31b26bb2c..3a996383cfab 100644
--- a/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh
+++ b/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh
@@ -20,7 +20,7 @@
 #########################
 is_int() {
     local -r int="${1:?missing value}"
-    if [[ "$int" =~ ^-?[0-9]+ ]]; then
+    if [[ "$int" =~ ^-?[0-9]+$ ]]; then
         true
     else
         false
diff --git a/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh b/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh
index f0d5a5cd3389..770861ecedcd 100644
--- a/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh
+++ b/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh
@@ -49,3 +49,36 @@ get_sematic_version () {
         fi
     fi
 }
+
+########################
+# Compares two semantic versions
+# Arguments:
+#   $1 - version1: first version to compare
+#   $2 - version2: second version to compare
+# Returns:
+#   -1 if version1 is less than version2
+#   0 if version1 is equal to version2
+#   1 if version1 is greater than version2
+#########################
+compare_semantic_versions() {
+    local version1="${1:?version1 is required}"
+    local version2="${2:?version2 is required}"
+    local major1 major2 minor1 minor2 patch1 patch2
+
+    major1="$(get_sematic_version "$version1" 1)"
+    major2="$(get_sematic_version "$version2" 1)"
+    minor1="$(get_sematic_version "$version1" 2)"
+    minor2="$(get_sematic_version "$version2" 2)"
+    patch1="$(get_sematic_version "$version1" 3)"
+    patch2="$(get_sematic_version "$version2" 3)"
+
+    if [[ "$major1" -eq "$major2" ]] && [[ "$minor1" -eq "$minor2" ]] && [[ "$patch1" -eq "$patch2" ]]; then
+        echo "0"
+    elif [[ "$major1" -lt "$major2" ]] ||
+      { [[ "$major1" -eq "$major2" ]] && [[ "$minor1" -lt "$minor2" ]]; } ||
+      { [[ "$major1" -eq "$major2" ]] && [[ "$minor1" -eq "$minor2" ]] && [[ "$patch1" -lt "$patch2" ]]; }; then
+        echo "-1"
+    else
+        echo "1"
+    fi
+}
diff --git a/bitnami/valkey/9.1/debian-12/rootfs/opt/bitnami/scripts/libvalkey.sh b/bitnami/valkey/9.1/debian-12/rootfs/opt/bitnami/scripts/libvalkey.sh
index 1e87bd02153b..3b10dc9e6d3d 100644
--- a/bitnami/valkey/9.1/debian-12/rootfs/opt/bitnami/scripts/libvalkey.sh
+++ b/bitnami/valkey/9.1/debian-12/rootfs/opt/bitnami/scripts/libvalkey.sh
@@ -50,10 +50,14 @@ valkey_conf_set() {
     local value="${2:-}"
 
     # Sanitize inputs
+    # 1. Escape special characters (\, &, ?)
     value="${value//\\/\\\\}"
     value="${value//&/\\&}"
     value="${value//\?/\\?}"
-    value="${value//[$'\t\n\r']}"
+    # 2. \000-\037 strips all ASCII control characters (0-31)
+    # 3. \177 strips DEL (delete) character (127)
+    value="${value//[$'\000'-$'\037'$'\177']}"
+    # 4. If the value is empty, set it to an empty string
     [[ "$value" = "" ]] && value="\"$value\""
 
     # Determine whether to enable the configuration for RDB persistence, if yes, do not enable the replacement operation
@@ -269,11 +273,13 @@ valkey_configure_replication() {
     elif [[ "$VALKEY_REPLICATION_MODE" = "replica" ]]; then
         if [[ -n "$VALKEY_SENTINEL_HOST" ]]; then
             local -a sentinel_info_command=("valkey-cli" "-h" "${VALKEY_SENTINEL_HOST}" "-p" "${VALKEY_SENTINEL_PORT_NUMBER}")
-            is_boolean_yes "$VALKEY_TLS_ENABLED" && sentinel_info_command+=("--tls" "--cert" "${VALKEY_TLS_CERT_FILE}" "--key" "${VALKEY_TLS_KEY_FILE}")
-            # shellcheck disable=SC2015
-            is_empty_value "$VALKEY_TLS_CA_FILE" && sentinel_info_command+=("--cacertdir" "${VALKEY_TLS_CA_DIR}") || sentinel_info_command+=("--cacert" "${VALKEY_TLS_CA_FILE}")
+            if is_boolean_yes "$VALKEY_TLS_ENABLED"; then
+                sentinel_info_command+=("--tls" "--cert" "${VALKEY_TLS_CERT_FILE}" "--key" "${VALKEY_TLS_KEY_FILE}")
+                # shellcheck disable=SC2015
+                is_empty_value "$VALKEY_TLS_CA_FILE" && sentinel_info_command+=("--cacertdir" "${VALKEY_TLS_CA_DIR}") || sentinel_info_command+=("--cacert" "${VALKEY_TLS_CA_FILE}")
+            fi
             sentinel_info_command+=("sentinel" "get-master-addr-by-name" "${VALKEY_SENTINEL_PRIMARY_NAME}")
-            read -r -a VALKEY_SENTINEL_INFO <<< "$("${sentinel_info_command[@]}" | tr '\n' ' ')"
+            read -r -a VALKEY_SENTINEL_INFO <<< "$(REDISCLI_AUTH="${VALKEY_SENTINEL_PASSWORD:-}" "${sentinel_info_command[@]}" | tr '\n' ' ')"
             VALKEY_PRIMARY_HOST=${VALKEY_SENTINEL_INFO[0]}
             VALKEY_PRIMARY_PORT_NUMBER=${VALKEY_SENTINEL_INFO[1]}
         fi
@@ -399,8 +405,11 @@ valkey_configure_default() {
             rm "${VALKEY_BASE_DIR}/etc/valkey-default.conf"
         fi
         cp "${VALKEY_MOUNTED_CONF_DIR}/valkey.conf" "${VALKEY_BASE_DIR}/etc/valkey.conf"
+        chmod 600 "${VALKEY_BASE_DIR}/etc/valkey.conf"
     else
         info "Setting Valkey config file"
+        # We try to enforce strict permissions, but we don't fail if it's not possible
+        chmod 600 "${VALKEY_BASE_DIR}/etc/valkey.conf" || true
         if is_boolean_yes "$ALLOW_EMPTY_PASSWORD"; then
             # Allow remote connections without password
             valkey_conf_set protected-mode no
diff --git a/bitnami/valkey/9.1/debian-12/rootfs/opt/bitnami/scripts/valkey-env.sh b/bitnami/valkey/9.1/debian-12/rootfs/opt/bitnami/scripts/valkey-env.sh
index a7666c1b9691..b14ca75d13cb 100644
--- a/bitnami/valkey/9.1/debian-12/rootfs/opt/bitnami/scripts/valkey-env.sh
+++ b/bitnami/valkey/9.1/debian-12/rootfs/opt/bitnami/scripts/valkey-env.sh
@@ -57,6 +57,7 @@ valkey_env_vars=(
     VALKEY_SENTINEL_PRIMARY_NAME
     VALKEY_SENTINEL_HOST
     VALKEY_SENTINEL_PORT_NUMBER
+    VALKEY_SENTINEL_PASSWORD
     VALKEY_TLS_PORT
 )
 for env_var in "${valkey_env_vars[@]}"; do
@@ -130,5 +131,6 @@ export VALKEY_TLS_AUTH_CLIENTS="${VALKEY_TLS_AUTH_CLIENTS:-yes}"
 export VALKEY_SENTINEL_PRIMARY_NAME="${VALKEY_SENTINEL_PRIMARY_NAME:-}"
 export VALKEY_SENTINEL_HOST="${VALKEY_SENTINEL_HOST:-}"
 export VALKEY_SENTINEL_PORT_NUMBER="${VALKEY_SENTINEL_PORT_NUMBER:-26379}"
+export VALKEY_SENTINEL_PASSWORD="${VALKEY_SENTINEL_PASSWORD:-}"
 
 # Custom environment variables may be defined below
diff --git a/bitnami/valkey/README.md b/bitnami/valkey/README.md
index 78111c7969cf..1318c4637954 100644
--- a/bitnami/valkey/README.md
+++ b/bitnami/valkey/README.md
@@ -113,6 +113,7 @@ The following tables list the main variables you can set.
 | `VALKEY_SENTINEL_PRIMARY_NAME`    | Valkey Sentinel primary name                       | `nil`                                       |
 | `VALKEY_SENTINEL_HOST`            | Valkey Sentinel host                               | `nil`                                       |
 | `VALKEY_SENTINEL_PORT_NUMBER`     | Valkey Sentinel host port (used by replicas)       | `26379`                                     |
+| `VALKEY_SENTINEL_PASSWORD`        | Valkey Sentinel password                           | `nil`                                       |
 
 #### Read-only environment variables