diff --git a/bitnami/solr/8/debian-9/Dockerfile b/bitnami/solr/8/debian-9/Dockerfile
index 15f511805798..a8dba7cabbf3 100644
--- a/bitnami/solr/8/debian-9/Dockerfile
+++ b/bitnami/solr/8/debian-9/Dockerfile
@@ -2,7 +2,8 @@ FROM bitnami/minideb-extras:stretch-r494
 LABEL maintainer "Bitnami <containers@bitnami.com>"
 
 ENV BITNAMI_PKG_CHMOD="-R g+rwX" \
-    HOME="/"
+    HOME="/" \
+    PATH="/opt/bitnami/java/bin:/opt/bitnami/solr/bin:$PATH"
 
 # Install required system packages and dependencies
 RUN install_packages libc6 libgcc1 lsof zlib1g
@@ -11,9 +12,8 @@ RUN bitnami-pkg unpack solr-8.4.0-0 --checksum ed0ad6470159e534ef1df37bdcbd5fef0
 
 COPY rootfs /
 ENV BITNAMI_APP_NAME="solr" \
-    BITNAMI_IMAGE_VERSION="8.4.0-debian-9-r10" \
+    BITNAMI_IMAGE_VERSION="8.4.0-debian-9-r11" \
     NAMI_PREFIX="/.nami" \
-    PATH="/opt/bitnami/java/bin:/opt/bitnami/solr/bin:$PATH" \
     SOLR_CORE="" \
     SOLR_CORE_CONF_DIR="_default" \
     SOLR_PORT_NUMBER="8983" \
diff --git a/bitnami/solr/README.md b/bitnami/solr/README.md
index ad1450624f77..e3ceda75fe30 100644
--- a/bitnami/solr/README.md
+++ b/bitnami/solr/README.md
@@ -50,7 +50,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 
 * [`8-ol-7`, `8.4.0-ol-7-r9` (8/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-solr/blob/8.4.0-ol-7-r9/8/ol-7/Dockerfile)
-* [`8-debian-9`, `8.4.0-debian-9-r10`, `8`, `8.4.0`, `8.4.0-r10`, `latest` (8/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-solr/blob/8.4.0-debian-9-r10/8/debian-9/Dockerfile)
+* [`8-debian-9`, `8.4.0-debian-9-r11`, `8`, `8.4.0`, `8.4.0-r11`, `latest` (8/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-solr/blob/8.4.0-debian-9-r11/8/debian-9/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/solr GitHub repo](https://github.com/bitnami/bitnami-docker-solr).