diff --git a/bitnami/minio/2020/debian-10/Dockerfile b/bitnami/minio/2020/debian-10/Dockerfile
index 58b0975aaa19..8b1e9c4250d8 100644
--- a/bitnami/minio/2020/debian-10/Dockerfile
+++ b/bitnami/minio/2020/debian-10/Dockerfile
@@ -1,15 +1,14 @@
 FROM docker.io/bitnami/minideb:buster
 LABEL maintainer "Bitnami <containers@bitnami.com>"
 
-ENV BITNAMI_PKG_CHMOD="-R g+rwX" \
-    HOME="/" \
+ENV HOME="/" \
     OS_ARCH="amd64" \
     OS_FLAVOUR="debian-10" \
     OS_NAME="linux"
 
 COPY prebuildfs /
 # Install required system packages and dependencies
-RUN install_packages ca-certificates curl jq procps sudo unzip
+RUN install_packages ca-certificates curl gzip jq procps tar
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "minio-client" "2020.5.16-0" --checksum cc949462e8ee90760ea06a89b4c1080d9d6fd14eefa7612d4ca629f8c08c6174
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "minio" "2020.5.16-0" --checksum a2d5e0ca5f7571167c6813833bb1e439377ddc04a31ddeac6277c0379a0a89f5
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.12.0-0" --checksum 582d501eeb6b338a24f417fededbf14295903d6be55c52d66c52e616c81bcd8c
@@ -19,8 +18,7 @@ RUN apt-get update && apt-get upgrade -y && \
 COPY rootfs /
 RUN /opt/bitnami/scripts/minio/postunpack.sh
 ENV BITNAMI_APP_NAME="minio" \
-    BITNAMI_IMAGE_VERSION="2020.5.16-debian-10-r4" \
-    NAMI_PREFIX="/.nami" \
+    BITNAMI_IMAGE_VERSION="2020.5.16-debian-10-r5" \
     PATH="/opt/bitnami/minio-client/bin:/opt/bitnami/minio/bin:/opt/bitnami/common/bin:$PATH"
 
 VOLUME [ "/data", "/certs" ]
diff --git a/bitnami/minio/2020/debian-10/docker-compose.yml b/bitnami/minio/2020/debian-10/docker-compose.yml
index 5f86d497e82e..dec9ae16b411 100644
--- a/bitnami/minio/2020/debian-10/docker-compose.yml
+++ b/bitnami/minio/2020/debian-10/docker-compose.yml
@@ -2,7 +2,7 @@ version: '2'
 
 services:
   minio:
-    image: 'bitnami/minio:2020'
+    image: 'docker.io/bitnami/minio:2020-debian-10'
     ports:
       - '9000:9000'
     volumes:
diff --git a/bitnami/minio/2020/debian-10/prebuildfs/usr/sbin/install_packages b/bitnami/minio/2020/debian-10/prebuildfs/usr/sbin/install_packages
new file mode 100755
index 000000000000..c9577647443b
--- /dev/null
+++ b/bitnami/minio/2020/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/minio/README.md b/bitnami/minio/README.md
index b759c0e58f81..97f44dce2351 100644
--- a/bitnami/minio/README.md
+++ b/bitnami/minio/README.md
@@ -43,7 +43,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/).
 
 
-* [`2020-debian-10`, `2020.5.16-debian-10-r4`, `2020`, `2020.5.16`, `latest` (2020/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-minio/blob/2020.5.16-debian-10-r4/2020/debian-10/Dockerfile)
+* [`2020-debian-10`, `2020.5.16-debian-10-r5`, `2020`, `2020.5.16`, `latest` (2020/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-minio/blob/2020.5.16-debian-10-r5/2020/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/minio GitHub repo](https://github.com/bitnami/bitnami-docker-minio).
 
diff --git a/bitnami/minio/docker-compose-distributed.yml b/bitnami/minio/docker-compose-distributed.yml
index 4d3f1f42a301..76b17e6625ad 100644
--- a/bitnami/minio/docker-compose-distributed.yml
+++ b/bitnami/minio/docker-compose-distributed.yml
@@ -2,7 +2,7 @@ version: '2'
 
 services:
   minio:
-    image: 'bitnami/minio:2020'
+    image: 'docker.io/bitnami/minio:2020-debian-10'
     ports:
       - 9000:9000
     volumes:
@@ -13,7 +13,7 @@ services:
       - MINIO_DISTRIBUTED_MODE_ENABLED=yes
       - MINIO_DISTRIBUTED_NODES=minio,minio2,minio3,minio4
   minio2:
-    image: 'bitnami/minio:2020'
+    image: 'docker.io/bitnami/minio:2020-debian-10'
     volumes:
       - 'minio_2_data:/data'
     environment:
@@ -22,7 +22,7 @@ services:
       - MINIO_DISTRIBUTED_MODE_ENABLED=yes
       - MINIO_DISTRIBUTED_NODES=minio,minio2,minio3,minio4
   minio3:
-    image: 'bitnami/minio:2020'
+    image: 'docker.io/bitnami/minio:2020-debian-10'
     volumes:
       - 'minio_3_data:/data'
     environment:
@@ -31,7 +31,7 @@ services:
       - MINIO_DISTRIBUTED_MODE_ENABLED=yes
       - MINIO_DISTRIBUTED_NODES=minio,minio2,minio3,minio4
   minio4:
-    image: 'bitnami/minio:2020'
+    image: 'docker.io/bitnami/minio:2020-debian-10'
     volumes:
       - 'minio_4_data:/data'
     environment:
diff --git a/bitnami/minio/docker-compose.yml b/bitnami/minio/docker-compose.yml
index 5f86d497e82e..dec9ae16b411 100644
--- a/bitnami/minio/docker-compose.yml
+++ b/bitnami/minio/docker-compose.yml
@@ -2,7 +2,7 @@ version: '2'
 
 services:
   minio:
-    image: 'bitnami/minio:2020'
+    image: 'docker.io/bitnami/minio:2020-debian-10'
     ports:
       - '9000:9000'
     volumes: