diff --git a/bitnami/solr/9/debian-12/Dockerfile b/bitnami/solr/9/debian-12/Dockerfile
index 1ca3b00a2fec..deac63fa56c0 100644
--- a/bitnami/solr/9/debian-12/Dockerfile
+++ b/bitnami/solr/9/debian-12/Dockerfile
@@ -9,10 +9,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-27T15:24:38Z" \
+      org.opencontainers.image.created="2025-04-02T14:43:21Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/solr/README.md" \
-      org.opencontainers.image.ref.name="9.8.1-debian-12-r2" \
+      org.opencontainers.image.ref.name="9.8.1-debian-12-r3" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/solr" \
       org.opencontainers.image.title="solr" \
       org.opencontainers.image.vendor="Broadcom, Inc." \
diff --git a/bitnami/solr/9/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/solr/9/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh
index b4084bbe976b..6b392b1d1e5c 100644
--- a/bitnami/solr/9/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh
+++ b/bitnami/solr/9/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
diff --git a/bitnami/solr/9/debian-12/rootfs/opt/bitnami/scripts/solr-env.sh b/bitnami/solr/9/debian-12/rootfs/opt/bitnami/scripts/solr-env.sh
index 3442e7fd06d9..9001aae08673 100644
--- a/bitnami/solr/9/debian-12/rootfs/opt/bitnami/scripts/solr-env.sh
+++ b/bitnami/solr/9/debian-12/rootfs/opt/bitnami/scripts/solr-env.sh
@@ -43,6 +43,8 @@ solr_env_vars=(
     SOLR_CORE_CONF_DIR
     SOLR_SSL_ENABLED
     SOLR_SSL_CHECK_PEER_NAME
+    SOLR_SSL_KEY_STORE_PASSWORD
+    SOLR_SSL_TRUST_STORE_PASSWORD
     SOLR_ZK_MAX_RETRIES
     SOLR_ZK_SLEEP_TIME
     SOLR_ZK_CHROOT
@@ -99,6 +101,8 @@ export SOLR_CLOUD_BOOTSTRAP="${SOLR_CLOUD_BOOTSTRAP:-no}"
 export SOLR_CORE_CONF_DIR="${SOLR_CORE_CONF_DIR:-${SOLR_SERVER_DIR}/solr/configsets/_default/conf}"
 export SOLR_SSL_ENABLED="${SOLR_SSL_ENABLED:-no}"
 export SOLR_SSL_CHECK_PEER_NAME="${SOLR_SSL_CHECK_PEER_NAME:-false}"
+export SOLR_SSL_KEY_STORE_PASSWORD="${SOLR_SSL_KEY_STORE_PASSWORD:-}"
+export SOLR_SSL_TRUST_STORE_PASSWORD="${SOLR_SSL_TRUST_STORE_PASSWORD:-}"
 
 # System users (when running with a privileged user)
 export SOLR_DAEMON_USER="solr"
diff --git a/bitnami/solr/README.md b/bitnami/solr/README.md
index c06839017bf1..3acd2956e9af 100644
--- a/bitnami/solr/README.md
+++ b/bitnami/solr/README.md
@@ -171,6 +171,8 @@ docker-compose up -d
 | `SOLR_CORE_CONF_DIR`            | Solar CORE configuration directory                                            | `${SOLR_SERVER_DIR}/solr/configsets/_default/conf` |
 | `SOLR_SSL_ENABLED`              | Indicates if Solr starts with SSL enabled                                     | `no`                                               |
 | `SOLR_SSL_CHECK_PEER_NAME`      | Indicates if Solr should check the peer names                                 | `false`                                            |
+| `SOLR_SSL_KEY_STORE_PASSWORD`   | Password for the Solr SSL keystore                                            | `nil`                                              |
+| `SOLR_SSL_TRUST_STORE_PASSWORD` | Password for the Solr SSL truststore                                          | `nil`                                              |
 | `SOLR_ZK_MAX_RETRIES`           | Maximum retries when waiting for zookeeper configuration operations to finish | `5`                                                |
 | `SOLR_ZK_SLEEP_TIME`            | Sleep time when waiting for zookeeper configuration operations to finish      | `5`                                                |
 | `SOLR_ZK_CHROOT`                | ZooKeeper ZNode chroot where to store solr data. Default: /solr               | `/solr`                                            |