diff --git a/bitnami/solr/9/debian-12/Dockerfile b/bitnami/solr/9/debian-12/Dockerfile
index 228d230fae3d..1ca3b00a2fec 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-17T11:05:55Z" \
+      org.opencontainers.image.created="2025-03-27T15:24:38Z" \
       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-r1" \
+      org.opencontainers.image.ref.name="9.8.1-debian-12-r2" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/solr" \
       org.opencontainers.image.title="solr" \
       org.opencontainers.image.vendor="Broadcom, Inc." \
@@ -27,7 +27,7 @@ COPY prebuildfs /
 SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"]
 # Install required system packages and dependencies
 RUN install_packages acl ca-certificates curl lsof netcat-openbsd 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-17.0.14-10-1-linux-${OS_ARCH}-debian-12" \
       "solr-9.8.1-0-linux-${OS_ARCH}-debian-12" \
@@ -38,7 +38,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 update && apt-get upgrade -y && \