diff --git a/bitnami/mysql/8.0/debian-10/Dockerfile b/bitnami/mysql/8.0/debian-10/Dockerfile
index c1f030427988..7abc30e763e9 100644
--- a/bitnami/mysql/8.0/debian-10/Dockerfile
+++ b/bitnami/mysql/8.0/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 libaio1 libc6 libgcc1 libncurses6 libsasl2-2 libssl1.1 libstdc++6 libtinfo6 procps sudo unzip zlib1g
+RUN install_packages ca-certificates curl gzip libaio1 libc6 libgcc1 libncurses6 libsasl2-2 libssl1.1 libstdc++6 libtinfo6 procps tar zlib1g
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "mysql" "8.0.20-0" --checksum b1a390f90823ef295f50c34535d1d73603d2db37e37ced47b061a0d5ad9d24fc
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.12.0-0" --checksum 582d501eeb6b338a24f417fededbf14295903d6be55c52d66c52e616c81bcd8c
 RUN apt-get update && apt-get upgrade -y && \
@@ -19,8 +18,7 @@ RUN mkdir /docker-entrypoint-initdb.d
 COPY rootfs /
 RUN /opt/bitnami/scripts/mysql/postunpack.sh
 ENV BITNAMI_APP_NAME="mysql" \
-    BITNAMI_IMAGE_VERSION="8.0.20-debian-10-r20" \
-    NAMI_PREFIX="/.nami" \
+    BITNAMI_IMAGE_VERSION="8.0.20-debian-10-r21" \
     PATH="/opt/bitnami/mysql/bin:/opt/bitnami/mysql/sbin:/opt/bitnami/common/bin:$PATH"
 
 EXPOSE 3306
diff --git a/bitnami/mysql/8.0/debian-10/docker-compose.yml b/bitnami/mysql/8.0/debian-10/docker-compose.yml
index 1586e9077746..56a96f8b16f8 100644
--- a/bitnami/mysql/8.0/debian-10/docker-compose.yml
+++ b/bitnami/mysql/8.0/debian-10/docker-compose.yml
@@ -2,7 +2,7 @@ version: '2'
 
 services:
   mysql:
-    image: 'bitnami/mysql:8.0'
+    image: 'docker.io/bitnami/mysql:8.0-debian-10'
     ports:
       - '3306:3306'
     volumes:
diff --git a/bitnami/mysql/8.0/debian-10/prebuildfs/usr/sbin/install_packages b/bitnami/mysql/8.0/debian-10/prebuildfs/usr/sbin/install_packages
new file mode 100755
index 000000000000..c9577647443b
--- /dev/null
+++ b/bitnami/mysql/8.0/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/mysql/README.md b/bitnami/mysql/README.md
index 83b191645dd3..79dcd8da2b33 100644
--- a/bitnami/mysql/README.md
+++ b/bitnami/mysql/README.md
@@ -44,7 +44,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/).
 
 
-* [`8.0-debian-10`, `8.0.20-debian-10-r20`, `8.0`, `8.0.20`, `latest` (8.0/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mysql/blob/8.0.20-debian-10-r20/8.0/debian-10/Dockerfile)
+* [`8.0-debian-10`, `8.0.20-debian-10-r21`, `8.0`, `8.0.20`, `latest` (8.0/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mysql/blob/8.0.20-debian-10-r21/8.0/debian-10/Dockerfile)
 * [`5.7-debian-10`, `5.7.30-debian-10-r26`, `5.7`, `5.7.30` (5.7/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mysql/blob/5.7.30-debian-10-r26/5.7/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/mysql GitHub repo](https://github.com/bitnami/bitnami-docker-mysql).
diff --git a/bitnami/mysql/docker-compose-replication.yml b/bitnami/mysql/docker-compose-replication.yml
index 06ac1b0b569f..a3114d7eff6d 100644
--- a/bitnami/mysql/docker-compose-replication.yml
+++ b/bitnami/mysql/docker-compose-replication.yml
@@ -2,7 +2,7 @@ version: '2'
 
 services:
   mysql-master:
-    image: 'bitnami/mysql:8.0'
+    image: 'docker.io/bitnami/mysql:8.0-debian-10'
     ports:
       - '3306'
     volumes:
@@ -16,7 +16,7 @@ services:
       - ALLOW_EMPTY_PASSWORD=yes
       - MYSQL_ROOT_PASSWORD=my_root_password
   mysql-slave:
-    image: 'bitnami/mysql:8.0'
+    image: 'docker.io/bitnami/mysql:8.0-debian-10'
     ports:
       - '3306'
     depends_on:
diff --git a/bitnami/mysql/docker-compose.yml b/bitnami/mysql/docker-compose.yml
index 1586e9077746..56a96f8b16f8 100644
--- a/bitnami/mysql/docker-compose.yml
+++ b/bitnami/mysql/docker-compose.yml
@@ -2,7 +2,7 @@ version: '2'
 
 services:
   mysql:
-    image: 'bitnami/mysql:8.0'
+    image: 'docker.io/bitnami/mysql:8.0-debian-10'
     ports:
       - '3306:3306'
     volumes: