diff --git a/bitnami/spring-cloud-dataflow-shell/2/debian-12/Dockerfile b/bitnami/spring-cloud-dataflow-shell/2/debian-12/Dockerfile
index 6b78c4eb3117..1730b6784d74 100644
--- a/bitnami/spring-cloud-dataflow-shell/2/debian-12/Dockerfile
+++ b/bitnami/spring-cloud-dataflow-shell/2/debian-12/Dockerfile
@@ -8,10 +8,10 @@ ARG TARGETARCH
 
 LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
-      org.opencontainers.image.created="2025-03-15T18:41:20Z" \
+      org.opencontainers.image.created="2025-04-05T20:38:38Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/spring-cloud-dataflow-shell/README.md" \
-      org.opencontainers.image.ref.name="2.11.5-debian-12-r11" \
+      org.opencontainers.image.ref.name="2.11.5-debian-12-r12" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/spring-cloud-dataflow-shell" \
       org.opencontainers.image.title="spring-cloud-dataflow-shell" \
       org.opencontainers.image.vendor="Broadcom, Inc." \
@@ -26,7 +26,7 @@ COPY prebuildfs /
 SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"]
 # Install required system packages and dependencies
 RUN install_packages ca-certificates curl locales procps zlib1g
-RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \
+RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \
     COMPONENTS=( \
       "jre-21.0.6-10-1-linux-${OS_ARCH}-debian-12" \
       "spring-cloud-dataflow-shell-2.11.5-2-linux-${OS_ARCH}-debian-12" \
@@ -37,7 +37,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \
         curl -SsLf "https://${DOWNLOADS_URL}/${COMPONENT}.tar.gz.sha256" -O ; \
       fi ; \
       sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \
-      tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \
+      tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner ; \
       rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \
     done
 RUN apt-get autoremove --purge -y curl && \
diff --git a/bitnami/spring-cloud-dataflow-shell/2/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/spring-cloud-dataflow-shell/2/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh
index b4084bbe976b..6b392b1d1e5c 100644
--- a/bitnami/spring-cloud-dataflow-shell/2/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh
+++ b/bitnami/spring-cloud-dataflow-shell/2/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh
@@ -277,22 +277,12 @@ validate_string() {
                 return 1
                 ;;
             *)
-                break
+                string="$1"
                 ;;
         esac
         shift
     done
 
-    if [ "$#" -gt 1 ]; then
-        stderr_print "too many arguments provided"
-        return 2
-    elif [ "$#" -eq 0 ]; then
-        stderr_print "missing string"
-        return 1
-    else
-        string=$1
-    fi
-
     if [[ "$min_length" -ge 0 ]] && [[ "${#string}" -lt "$min_length" ]]; then
         echo "string length is less than $min_length"
         return 1