diff --git a/bitnami/valkey-cluster/9.1/debian-12/Dockerfile b/bitnami/valkey-cluster/9.1/debian-12/Dockerfile
index 1e6578d323b7..2cb149d2d655 100644
--- a/bitnami/valkey-cluster/9.1/debian-12/Dockerfile
+++ b/bitnami/valkey-cluster/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-06-01T14:48:08Z" \
+      org.opencontainers.image.created="2026-06-05T11:43:43Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/valkey-cluster/README.md" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/valkey-cluster" \
@@ -28,7 +28,7 @@ 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 \
@@ -50,7 +50,7 @@ COPY rootfs /
 RUN /opt/bitnami/scripts/valkey-cluster/postunpack.sh
 ENV APP_VERSION="9.1.0" \
     BITNAMI_APP_NAME="valkey-cluster" \
-    IMAGE_REVISION="3" \
+    IMAGE_REVISION="4" \
     PATH="/opt/bitnami/common/bin:/opt/bitnami/valkey/bin:$PATH"
 
 EXPOSE 6379
diff --git a/bitnami/valkey-cluster/9.1/debian-12/prebuildfs/opt/bitnami/checksums/wait-for-port-1.0.10-10-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/valkey-cluster/9.1/debian-12/prebuildfs/opt/bitnami/checksums/wait-for-port-1.0.10-10-linux-amd64-debian-12.tar.gz.sha256
deleted file mode 100644
index c96cae9e8074..000000000000
--- a/bitnami/valkey-cluster/9.1/debian-12/prebuildfs/opt/bitnami/checksums/wait-for-port-1.0.10-10-linux-amd64-debian-12.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-4af7eb9cb9f027f08bd67ead26a6585ac71810c7dc396a453df794235e3476b3  wait-for-port-1.0.10-10-linux-amd64-debian-12.tar.gz
diff --git a/bitnami/valkey-cluster/9.1/debian-12/prebuildfs/opt/bitnami/checksums/wait-for-port-1.0.10-10-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/valkey-cluster/9.1/debian-12/prebuildfs/opt/bitnami/checksums/wait-for-port-1.0.10-10-linux-arm64-debian-12.tar.gz.sha256
deleted file mode 100644
index aebeba63fd0f..000000000000
--- a/bitnami/valkey-cluster/9.1/debian-12/prebuildfs/opt/bitnami/checksums/wait-for-port-1.0.10-10-linux-arm64-debian-12.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-72c721c238602c257e3f933797f266358032e3d2267c4f99707a33de5ee2038e  wait-for-port-1.0.10-10-linux-arm64-debian-12.tar.gz
diff --git a/bitnami/valkey-cluster/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-cluster/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-cluster/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-cluster/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-cluster/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-cluster/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-cluster/9.1/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/valkey-cluster/9.1/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh
index 9d908c48579b..2d3c3bdb5f4a 100644
--- a/bitnami/valkey-cluster/9.1/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh
+++ b/bitnami/valkey-cluster/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-cluster/9.1/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/valkey-cluster/9.1/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh
index bbd31b26bb2c..3a996383cfab 100644
--- a/bitnami/valkey-cluster/9.1/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh
+++ b/bitnami/valkey-cluster/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-cluster/9.1/debian-12/rootfs/opt/bitnami/scripts/libvalkey.sh b/bitnami/valkey-cluster/9.1/debian-12/rootfs/opt/bitnami/scripts/libvalkey.sh
index c6d20ad55ec9..3b10dc9e6d3d 100644
--- a/bitnami/valkey-cluster/9.1/debian-12/rootfs/opt/bitnami/scripts/libvalkey.sh
+++ b/bitnami/valkey-cluster/9.1/debian-12/rootfs/opt/bitnami/scripts/libvalkey.sh
@@ -408,7 +408,8 @@ valkey_configure_default() {
         chmod 600 "${VALKEY_BASE_DIR}/etc/valkey.conf"
     else
         info "Setting Valkey config file"
-        chmod 600 "${VALKEY_BASE_DIR}/etc/valkey.conf"
+        # 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-cluster/9.1/debian-12/rootfs/opt/bitnami/scripts/valkey-cluster/run.sh b/bitnami/valkey-cluster/9.1/debian-12/rootfs/opt/bitnami/scripts/valkey-cluster/run.sh
index 1ed098549b67..5808cd2779cf 100755
--- a/bitnami/valkey-cluster/9.1/debian-12/rootfs/opt/bitnami/scripts/valkey-cluster/run.sh
+++ b/bitnami/valkey-cluster/9.1/debian-12/rootfs/opt/bitnami/scripts/valkey-cluster/run.sh
@@ -22,7 +22,18 @@ set -m
 
 read -ra nodes <<< "$(tr ',;' ' ' <<< "${VALKEY_NODES}")"
 
-args=("${REDIS_BASE_DIR}/etc/valkey.conf" "--daemonize" "no")
+args=("--port" "$VALKEY_PORT_NUMBER" "--include" "${VALKEY_BASE_DIR}/etc/valkey.conf")
+if ! is_boolean_yes "$ALLOW_EMPTY_PASSWORD"; then
+    if [[ -w "${VALKEY_BASE_DIR}/etc/valkey.conf" ]]; then
+        valkey_conf_set requirepass "$VALKEY_PASSWORD"
+        valkey_conf_set masterauth "$VALKEY_PASSWORD"
+    else
+        args+=("--requirepass" "$VALKEY_PASSWORD")
+        args+=("--masterauth" "$VALKEY_PASSWORD")
+    fi
+else
+    args+=("--protected-mode" "no")
+fi
 # Add flags specified via the 'VALKEY_EXTRA_FLAGS' environment variable
 read -r -a extra_flags <<< "$VALKEY_EXTRA_FLAGS"
 [[ "${#extra_flags[@]}" -gt 0 ]] && args+=("${extra_flags[@]}")