diff --git a/bitnami/mariadb/10.3/debian-10/Dockerfile b/bitnami/mariadb/10.3/debian-10/Dockerfile
index a9133addde1f..aeab60cb42be 100644
--- a/bitnami/mariadb/10.3/debian-10/Dockerfile
+++ b/bitnami/mariadb/10.3/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 libaudit1 libc6 libcap-ng0 libgcc1 libicu63 libjemalloc2 liblzma5 libncurses6 libpam0g libssl1.1 libstdc++6 libtinfo6 libxml2 procps sudo unzip zlib1g
+RUN install_packages ca-certificates curl gzip libaio1 libaudit1 libc6 libcap-ng0 libgcc1 libicu63 libjemalloc2 liblzma5 libncurses6 libpam0g libssl1.1 libstdc++6 libtinfo6 libxml2 procps tar zlib1g
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "mariadb" "10.3.23-0" --checksum 3d0ad1ae27b595cc34d88902b8e27772fbff0c2d9b2feece055a3c7c1bf2c497
 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/mariadb/postunpack.sh
 ENV BITNAMI_APP_NAME="mariadb" \
-    BITNAMI_IMAGE_VERSION="10.3.23-debian-10-r6" \
-    NAMI_PREFIX="/.nami" \
+    BITNAMI_IMAGE_VERSION="10.3.23-debian-10-r7" \
     PATH="/opt/bitnami/mariadb/bin:/opt/bitnami/mariadb/sbin:/opt/bitnami/common/bin:$PATH"
 
 EXPOSE 3306
diff --git a/bitnami/mariadb/10.3/debian-10/docker-compose.yml b/bitnami/mariadb/10.3/debian-10/docker-compose.yml
index 1ca4761152df..94db5cbdbac2 100644
--- a/bitnami/mariadb/10.3/debian-10/docker-compose.yml
+++ b/bitnami/mariadb/10.3/debian-10/docker-compose.yml
@@ -2,7 +2,7 @@ version: '2'
 
 services:
   mariadb:
-    image: 'bitnami/mariadb:10.3'
+    image: 'docker.io/bitnami/mariadb:10.3-debian-10'
     ports:
       - '3306:3306'
     volumes:
diff --git a/bitnami/mariadb/10.3/debian-10/prebuildfs/usr/sbin/install_packages b/bitnami/mariadb/10.3/debian-10/prebuildfs/usr/sbin/install_packages
new file mode 100755
index 000000000000..c9577647443b
--- /dev/null
+++ b/bitnami/mariadb/10.3/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/mariadb/README.md b/bitnami/mariadb/README.md
index e7f66681d47e..c0186cc49ff3 100644
--- a/bitnami/mariadb/README.md
+++ b/bitnami/mariadb/README.md
@@ -45,7 +45,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 
 * [`10.4-debian-10`, `10.4.13-debian-10-r4`, `10.4`, `10.4.13` (10.4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb/blob/10.4.13-debian-10-r4/10.4/debian-10/Dockerfile)
-* [`10.3-debian-10`, `10.3.23-debian-10-r6`, `10.3`, `10.3.23`, `latest` (10.3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb/blob/10.3.23-debian-10-r6/10.3/debian-10/Dockerfile)
+* [`10.3-debian-10`, `10.3.23-debian-10-r7`, `10.3`, `10.3.23`, `latest` (10.3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb/blob/10.3.23-debian-10-r7/10.3/debian-10/Dockerfile)
 * [`10.2-debian-10`, `10.2.32-debian-10-r6`, `10.2`, `10.2.32` (10.2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb/blob/10.2.32-debian-10-r6/10.2/debian-10/Dockerfile)
 * [`10.1-debian-10`, `10.1.45-debian-10-r7`, `10.1`, `10.1.45` (10.1/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb/blob/10.1.45-debian-10-r7/10.1/debian-10/Dockerfile)
 
diff --git a/bitnami/mariadb/docker-compose-replication.yml b/bitnami/mariadb/docker-compose-replication.yml
index f5a609ec5bed..bf981cc92939 100644
--- a/bitnami/mariadb/docker-compose-replication.yml
+++ b/bitnami/mariadb/docker-compose-replication.yml
@@ -2,7 +2,7 @@ version: '2'
 
 services:
   mariadb-master:
-    image: 'bitnami/mariadb:10.3'
+    image: 'docker.io/bitnami/mariadb:10.3-debian-10'
     ports:
       - '3306'
     volumes:
@@ -16,7 +16,7 @@ services:
       - ALLOW_EMPTY_PASSWORD=yes
       - MARIADB_ROOT_PASSWORD=my_root_password
   mariadb-slave:
-    image: 'bitnami/mariadb:10.3'
+    image: 'docker.io/bitnami/mariadb:10.3-debian-10'
     ports:
       - '3306'
     depends_on:
diff --git a/bitnami/mariadb/docker-compose.yml b/bitnami/mariadb/docker-compose.yml
index 1ca4761152df..94db5cbdbac2 100644
--- a/bitnami/mariadb/docker-compose.yml
+++ b/bitnami/mariadb/docker-compose.yml
@@ -2,7 +2,7 @@ version: '2'
 
 services:
   mariadb:
-    image: 'bitnami/mariadb:10.3'
+    image: 'docker.io/bitnami/mariadb:10.3-debian-10'
     ports:
       - '3306:3306'
     volumes: