diff --git a/bitnami/solr/8/debian-10/Dockerfile b/bitnami/solr/8/debian-10/Dockerfile
index 234fb0e88914..8fad46fae2f3 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-r11" \
+    BITNAMI_IMAGE_VERSION="8.9.0-debian-10-r12" \
     PATH="/opt/bitnami/java/bin:/opt/bitnami/solr/bin:/opt/bitnami/common/bin:$PATH"
 
 EXPOSE 8983
diff --git a/bitnami/solr/8/debian-10/prebuildfs/opt/bitnami/scripts/libfile.sh b/bitnami/solr/8/debian-10/prebuildfs/opt/bitnami/scripts/libfile.sh
index b09575cbe4a6..dd47f25e4e45 100644
--- a/bitnami/solr/8/debian-10/prebuildfs/opt/bitnami/scripts/libfile.sh
+++ b/bitnami/solr/8/debian-10/prebuildfs/opt/bitnami/scripts/libfile.sh
@@ -2,6 +2,11 @@
 #
 # Library for managing files
 
+# shellcheck disable=SC1091
+
+# Load Generic Libraries
+. /opt/bitnami/scripts/libos.sh
+
 # Functions
 
 ########################
@@ -78,3 +83,37 @@ append_file_after_last_match() {
     result="$(tac "$file" | sed -E "0,/($match_regex)/s||${value}\n\1|" | tac)"
     echo "$result" > "$file"
 }
+
+########################
+# Wait until certain entry is present in a log file
+# Arguments:
+#   $1 - entry to look for
+#   $2 - log file
+#   $3 - max retries. Default: 12
+#   $4 - sleep between retries (in seconds). Default: 5
+# Returns:
+#   Boolean
+#########################
+wait_for_log_entry() {
+    local -r entry="${1:-missing entry}"
+    local -r log_file="${2:-missing log file}"
+    local -r retries="${3:-12}"
+    local -r interval_time="${4:-5}"
+    local attempt=0
+
+    check_log_file_for_entry() {
+        if ! grep -qE "$entry" "$log_file"; then
+            debug "Entry \"${entry}\" still not present in ${log_file} (attempt $((++attempt))/${retries})"
+            return 1
+        fi
+    }
+    debug "Checking that ${log_file} log file contains entry \"${entry}\""
+    if retry_while check_log_file_for_entry "$retries" "$interval_time"; then
+        debug "Found entry \"${entry}\" in ${log_file}"
+        true
+    else
+        error "Could not find entry \"${entry}\" in ${log_file} after ${retries} retries"
+        debug_execute cat "$log_file"
+        return 1
+    fi
+}
diff --git a/bitnami/solr/README.md b/bitnami/solr/README.md
index fecd610ac4fa..5f64706205d2 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-r11`, `latest` (8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-solr/blob/8.9.0-debian-10-r11/8/debian-10/Dockerfile)
+* [`8`, `8-debian-10`, `8.9.0`, `8.9.0-debian-10-r12`, `latest` (8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-solr/blob/8.9.0-debian-10-r12/8/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/solr GitHub repo](https://github.com/bitnami/bitnami-docker-solr).