diff --git a/bitnami/solr/8/debian-10/Dockerfile b/bitnami/solr/8/debian-10/Dockerfile
index d58f8eb55486..2e1da0362282 100644
--- a/bitnami/solr/8/debian-10/Dockerfile
+++ b/bitnami/solr/8/debian-10/Dockerfile
@@ -19,7 +19,7 @@ RUN /build/install-tini.sh
 
 COPY rootfs /
 ENV BITNAMI_APP_NAME="solr" \
-    BITNAMI_IMAGE_VERSION="8.4.1-debian-10-r30" \
+    BITNAMI_IMAGE_VERSION="8.4.1-debian-10-r31" \
     NAMI_PREFIX="/.nami" \
     SOLR_CORE="" \
     SOLR_CORE_CONF_DIR="_default" \
diff --git a/bitnami/solr/8/debian-10/prebuildfs/build/bitnami-user.sh b/bitnami/solr/8/debian-10/prebuildfs/build/bitnami-user.sh
index ab84296bcdfa..0b21a219a4f3 100755
--- a/bitnami/solr/8/debian-10/prebuildfs/build/bitnami-user.sh
+++ b/bitnami/solr/8/debian-10/prebuildfs/build/bitnami-user.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
 useradd -ms /bin/bash bitnami
-mkdir -p /opt/bitnami && chown bitnami:bitnami /opt/bitnami
+mkdir -p /opt/bitnami
 sed -i -e 's/\s*Defaults\s*secure_path\s*=/# Defaults secure_path=/' /etc/sudoers
 echo 'bitnami ALL=NOPASSWD: ALL' >> /etc/sudoers
diff --git a/bitnami/solr/README.md b/bitnami/solr/README.md
index 529e5705a3bb..0fc83f56a0a4 100644
--- a/bitnami/solr/README.md
+++ b/bitnami/solr/README.md
@@ -49,7 +49,7 @@ $ kubectl apply -f test.yaml
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/containers/how-to/understand-rolling-tags-containers/).
 
 
-* [`8-debian-10`, `8.4.1-debian-10-r30`, `8`, `8.4.1`, `latest` (8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-solr/blob/8.4.1-debian-10-r30/8/debian-10/Dockerfile)
+* [`8-debian-10`, `8.4.1-debian-10-r31`, `8`, `8.4.1`, `latest` (8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-solr/blob/8.4.1-debian-10-r31/8/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/solr GitHub repo](https://github.com/bitnami/bitnami-docker-solr).