diff --git a/bitnami/logstash/7/debian-10/Dockerfile b/bitnami/logstash/7/debian-10/Dockerfile
index e6a1922527d6..5f94667767de 100644
--- a/bitnami/logstash/7/debian-10/Dockerfile
+++ b/bitnami/logstash/7/debian-10/Dockerfile
@@ -8,9 +8,9 @@ ENV HOME="/" \
 
 COPY prebuildfs /
 # Install required system packages and dependencies
-RUN install_packages ca-certificates curl libc6 libgcc1 procps sudo unzip
+RUN install_packages ca-certificates curl gzip libc6 procps tar zlib1g
+RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "java" "11.0.7-1" --checksum e01669f15e2e655613c19eab1b8b533a720d6334766da34190a2a4939f5a0bc8
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "logstash" "7.7.0-0" --checksum 2b78d025551fc5866e48381c077c44ffc21a099e76dfd24194f2e41b65ff4601
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "java" "1.8.252-0" --checksum d7271eff41b312b73aea7aea3b79a6b1a69cf6613804803daff952aff7d440b4
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.12.0-0" --checksum 582d501eeb6b338a24f417fededbf14295903d6be55c52d66c52e616c81bcd8c
 RUN apt-get update && apt-get upgrade -y && \
     rm -r /var/lib/apt/lists /var/cache/apt/archives
@@ -18,8 +18,8 @@ RUN apt-get update && apt-get upgrade -y && \
 COPY rootfs /
 RUN /opt/bitnami/scripts/logstash/postunpack.sh
 ENV BITNAMI_APP_NAME="logstash" \
-    BITNAMI_IMAGE_VERSION="7.7.0-debian-10-r6" \
-    PATH="/opt/bitnami/logstash/bin:/opt/bitnami/java/bin:/opt/bitnami/common/bin:$PATH"
+    BITNAMI_IMAGE_VERSION="7.7.0-debian-10-r7" \
+    PATH="/opt/bitnami/java/bin:/opt/bitnami/logstash/bin:/opt/bitnami/common/bin:$PATH"
 
 EXPOSE 8080
 
diff --git a/bitnami/logstash/7/debian-10/docker-compose.yml b/bitnami/logstash/7/debian-10/docker-compose.yml
index 1d449e3a0e7b..df1d5fc376b5 100644
--- a/bitnami/logstash/7/debian-10/docker-compose.yml
+++ b/bitnami/logstash/7/debian-10/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '2'
 services:
   logstash:
-    image: bitnami/logstash:7
+    image: docker.io/bitnami/logstash:7-debian-10
     ports:
       - 8080:8080
     volumes:
diff --git a/bitnami/logstash/7/debian-10/prebuildfs/usr/sbin/install_packages b/bitnami/logstash/7/debian-10/prebuildfs/usr/sbin/install_packages
new file mode 100755
index 000000000000..c9577647443b
--- /dev/null
+++ b/bitnami/logstash/7/debian-10/prebuildfs/usr/sbin/install_packages
@@ -0,0 +1,24 @@
+#!/bin/sh
+set -e
+set -u
+export DEBIAN_FRONTEND=noninteractive
+n=0
+max=2
+until [ $n -gt $max ]; do
+    set +e
+    (
+      apt-get update -qq &&
+      apt-get install -y --no-install-recommends "$@"
+    )
+    CODE=$?
+    set -e
+    if [ $CODE -eq 0 ]; then
+        break
+    fi
+    if [ $n -eq $max ]; then
+        exit $CODE
+    fi
+    echo "apt failed, retrying"
+    n=$(($n + 1))
+done
+rm -r /var/lib/apt/lists /var/cache/apt/archives
diff --git a/bitnami/logstash/README.md b/bitnami/logstash/README.md
index 8bb5974d32f0..60458ab46c60 100644
--- a/bitnami/logstash/README.md
+++ b/bitnami/logstash/README.md
@@ -42,7 +42,7 @@ Non-root container images add an extra layer of security and are generally recom
 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/).
 
 
-* [`7-debian-10`, `7.7.0-debian-10-r6`, `7`, `7.7.0`, `latest` (7/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-logstash/blob/7.7.0-debian-10-r6/7/debian-10/Dockerfile)
+* [`7-debian-10`, `7.7.0-debian-10-r7`, `7`, `7.7.0`, `latest` (7/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-logstash/blob/7.7.0-debian-10-r7/7/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/logstash GitHub repo](https://github.com/bitnami/bitnami-docker-logstash).
 
diff --git a/bitnami/logstash/docker-compose.yml b/bitnami/logstash/docker-compose.yml
index 1d449e3a0e7b..df1d5fc376b5 100644
--- a/bitnami/logstash/docker-compose.yml
+++ b/bitnami/logstash/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '2'
 services:
   logstash:
-    image: bitnami/logstash:7
+    image: docker.io/bitnami/logstash:7-debian-10
     ports:
       - 8080:8080
     volumes: