diff --git a/bitnami/solr/8/debian-10/Dockerfile b/bitnami/solr/8/debian-10/Dockerfile
index 5396b1cd5422..900046f6af45 100644
--- a/bitnami/solr/8/debian-10/Dockerfile
+++ b/bitnami/solr/8/debian-10/Dockerfile
@@ -17,7 +17,7 @@ RUN chmod g+rwX /opt/bitnami
 COPY rootfs /
 RUN /opt/bitnami/scripts/solr/postunpack.sh
 ENV BITNAMI_APP_NAME="solr" \
-    BITNAMI_IMAGE_VERSION="8.9.0-debian-10-r9" \
+    BITNAMI_IMAGE_VERSION="8.9.0-debian-10-r10" \
     PATH="/opt/bitnami/java/bin:/opt/bitnami/solr/bin:/opt/bitnami/common/bin:$PATH"
 
 EXPOSE 8983
diff --git a/bitnami/solr/8/debian-10/rootfs/opt/bitnami/scripts/solr-env.sh b/bitnami/solr/8/debian-10/rootfs/opt/bitnami/scripts/solr-env.sh
index 8076a93d8f70..2b3cfe4f5bf3 100644
--- a/bitnami/solr/8/debian-10/rootfs/opt/bitnami/scripts/solr-env.sh
+++ b/bitnami/solr/8/debian-10/rootfs/opt/bitnami/scripts/solr-env.sh
@@ -25,6 +25,7 @@ solr_env_vars=(
     SOLR_NUMBER_OF_NODES
     SOLR_HOST
     SOLR_HEAP
+    SOLR_JAVA_MEM
     SOLR_PORT_NUMBER
     SOLR_CORE
     SOLR_COLLECTION
@@ -72,7 +73,8 @@ export SOLR_DATA_TO_PERSIST="server/solr"
 export SOLR_ENABLE_CLOUD_MODE="${SOLR_ENABLE_CLOUD_MODE:-no}"
 export SOLR_NUMBER_OF_NODES="${SOLR_NUMBER_OF_NODES:-1}"
 export SOLR_HOST="${SOLR_HOST:-}"
-export SOLR_HEAP="${SOLR_HEAP:-512m}"
+export SOLR_HEAP="${SOLR_HEAP:-}"
+export SOLR_JAVA_MEM="${SOLR_JAVA_MEM:--Xms512m -Xmx512m}"
 export SOLR_PORT_NUMBER="${SOLR_PORT_NUMBER:-8983}"
 export SOLR_PID_FILE="${SOLR_PID_DIR}/solr-${SOLR_PORT_NUMBER}.pid"
 export SOLR_CORE="${SOLR_CORE:-}"
diff --git a/bitnami/solr/README.md b/bitnami/solr/README.md
index c82fc25a6a67..00b432b8a9b9 100644
--- a/bitnami/solr/README.md
+++ b/bitnami/solr/README.md
@@ -36,7 +36,7 @@ You can find the available configuration options in the [Environment Variables](
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/).
 
 
-* [`8`, `8-debian-10`, `8.9.0`, `8.9.0-debian-10-r9`, `latest` (8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-solr/blob/8.9.0-debian-10-r9/8/debian-10/Dockerfile)
+* [`8`, `8-debian-10`, `8.9.0`, `8.9.0-debian-10-r10`, `latest` (8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-solr/blob/8.9.0-debian-10-r10/8/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/solr GitHub repo](https://github.com/bitnami/bitnami-docker-solr).