diff --git a/bitnami/fluentd/1/debian-10/Dockerfile b/bitnami/fluentd/1/debian-10/Dockerfile
index fde26f37fd63..554d9ee55c19 100644
--- a/bitnami/fluentd/1/debian-10/Dockerfile
+++ b/bitnami/fluentd/1/debian-10/Dockerfile
@@ -8,7 +8,7 @@ ENV HOME="/" \
 
 COPY prebuildfs /
 # Install required system packages and dependencies
-RUN install_packages ca-certificates curl ghostscript imagemagick libc6 libgcc1 libgmp-dev libjemalloc-dev libncurses5-dev libncurses6 libreadline-dev libreadline7 libssl1.1 libstdc++6 libtinfo6 libxml2-dev libxslt1-dev procps sudo unzip wget zlib1g zlib1g-dev
+RUN install_packages ca-certificates curl ghostscript gzip imagemagick libc6 libgcc1 libgmp-dev libjemalloc-dev libncurses5-dev libncurses6 libreadline-dev libreadline7 libssl1.1 libstdc++6 libtinfo6 libxml2-dev libxslt1-dev procps tar zlib1g zlib1g-dev
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "ruby" "2.6.6-0" --checksum ecadce77e40822926c69f76cc11437954dd068793548c3f0a21007f9c4fafed3
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.12.0-0" --checksum 582d501eeb6b338a24f417fededbf14295903d6be55c52d66c52e616c81bcd8c
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "fluentd" "1.10.3-0" --checksum 9ac2570622fa41aac6ed14aa8a90b442258be097d9e51551d21e59d0c4869d66
@@ -18,7 +18,7 @@ RUN apt-get update && apt-get upgrade -y && \
 COPY rootfs /
 RUN /opt/bitnami/scripts/fluentd/postunpack.sh
 ENV BITNAMI_APP_NAME="fluentd" \
-    BITNAMI_IMAGE_VERSION="1.10.3-debian-10-r5" \
+    BITNAMI_IMAGE_VERSION="1.10.3-debian-10-r6" \
     GEM_HOME="/opt/bitnami/fluentd" \
     PATH="/opt/bitnami/ruby/bin:/opt/bitnami/common/bin:/opt/bitnami/fluentd/bin:$PATH"
 
diff --git a/bitnami/fluentd/1/debian-10/docker-compose.yml b/bitnami/fluentd/1/debian-10/docker-compose.yml
index 743d7afacae3..f3c2dea24b6a 100644
--- a/bitnami/fluentd/1/debian-10/docker-compose.yml
+++ b/bitnami/fluentd/1/debian-10/docker-compose.yml
@@ -2,7 +2,7 @@ version: '2'
 
 services:
   fluentd:
-    image: bitnami/fluentd:1
+    image: docker.io/bitnami/fluentd:1-debian-10
     ports:
       - '24224:24224'
       - '5140:5140'
diff --git a/bitnami/fluentd/1/debian-10/prebuildfs/usr/sbin/install_packages b/bitnami/fluentd/1/debian-10/prebuildfs/usr/sbin/install_packages
new file mode 100755
index 000000000000..c9577647443b
--- /dev/null
+++ b/bitnami/fluentd/1/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/fluentd/README.md b/bitnami/fluentd/README.md
index 688d5165699e..e5c496f81ce7 100644
--- a/bitnami/fluentd/README.md
+++ b/bitnami/fluentd/README.md
@@ -30,7 +30,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/).
 
 
-* [`1-debian-10`, `1.10.3-debian-10-r5`, `1`, `1.10.3`, `latest` (1/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-fluentd/blob/1.10.3-debian-10-r5/1/debian-10/Dockerfile)
+* [`1-debian-10`, `1.10.3-debian-10-r6`, `1`, `1.10.3`, `latest` (1/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-fluentd/blob/1.10.3-debian-10-r6/1/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/fluentd GitHub repo](https://github.com/bitnami/bitnami-docker-fluentd).
 
diff --git a/bitnami/fluentd/docker-compose.yml b/bitnami/fluentd/docker-compose.yml
index 743d7afacae3..f3c2dea24b6a 100644
--- a/bitnami/fluentd/docker-compose.yml
+++ b/bitnami/fluentd/docker-compose.yml
@@ -2,7 +2,7 @@ version: '2'
 
 services:
   fluentd:
-    image: bitnami/fluentd:1
+    image: docker.io/bitnami/fluentd:1-debian-10
     ports:
       - '24224:24224'
       - '5140:5140'