diff --git a/bitnami/reportserver/3/debian-10/Dockerfile b/bitnami/reportserver/3/debian-10/Dockerfile
index d04d695da4ba..ba954888a983 100644
--- a/bitnami/reportserver/3/debian-10/Dockerfile
+++ b/bitnami/reportserver/3/debian-10/Dockerfile
@@ -5,7 +5,7 @@ ENV PATH="/opt/bitnami/java/bin:/opt/bitnami/tomcat/bin:/opt/bitnami/mysql/bin:/
 
 COPY prebuildfs /
 # Install required system packages and dependencies
-RUN install_packages ca-certificates curl dirmngr fontconfig fonts-dejavu-extra gnupg 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 dirmngr fontconfig fonts-dejavu-extra gnupg gzip libaudit1 libc6 libcap-ng0 libgcc1 libicu63 libjemalloc2 liblzma5 libncurses6 libpam0g libssl1.1 libstdc++6 libtinfo6 libxml2 procps sudo tar zlib1g
 RUN /build/bitnami-user.sh
 RUN /build/install-nami.sh
 RUN bitnami-pkg install java-11.0.7-1 --checksum e01669f15e2e655613c19eab1b8b533a720d6334766da34190a2a4939f5a0bc8
@@ -20,7 +20,7 @@ RUN apt-get update && apt-get upgrade -y && \
 COPY rootfs /
 ENV ALLOW_EMPTY_PASSWORD="no" \
     BITNAMI_APP_NAME="reportserver" \
-    BITNAMI_IMAGE_VERSION="3.1.2-6022-debian-10-r61" \
+    BITNAMI_IMAGE_VERSION="3.1.2-6022-debian-10-r62" \
     MARIADB_HOST="mariadb" \
     MARIADB_PORT_NUMBER="3306" \
     MARIADB_ROOT_PASSWORD="" \
@@ -31,6 +31,9 @@ ENV ALLOW_EMPTY_PASSWORD="no" \
     MYSQL_CLIENT_CREATE_DATABASE_USER="" \
     MYSQL_CLIENT_ENABLE_SSL="no" \
     MYSQL_CLIENT_SSL_CA_FILE="" \
+    OS_ARCH="amd64" \
+    OS_FLAVOUR="debian-10" \
+    OS_NAME="linux" \
     REPORTSERVER_CRYPTPASSPHRASE="" \
     REPORTSERVER_CRYPTSALT="" \
     REPORTSERVER_DATABASE_NAME="bitnami_reportserver" \
diff --git a/bitnami/reportserver/3/debian-10/docker-compose.yml b/bitnami/reportserver/3/debian-10/docker-compose.yml
index 2735adf48fa9..5163ea922a1d 100644
--- a/bitnami/reportserver/3/debian-10/docker-compose.yml
+++ b/bitnami/reportserver/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'
     environment:
       - MARIADB_USER=bn_reportserver
       - MARIADB_DATABASE=bitnami_reportserver
@@ -10,7 +10,7 @@ services:
     volumes:
       - 'mariadb_data:/bitnami'
   reportserver:
-    image: 'bitnami/reportserver:3'
+    image: 'docker.io/bitnami/reportserver:3-debian-10'
     environment:
       - MARIADB_HOST=mariadb
       - MARIADB_PORT_NUMBER=3306
diff --git a/bitnami/reportserver/3/debian-10/prebuildfs/usr/sbin/install_packages b/bitnami/reportserver/3/debian-10/prebuildfs/usr/sbin/install_packages
new file mode 100755
index 000000000000..c9577647443b
--- /dev/null
+++ b/bitnami/reportserver/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/reportserver/README.md b/bitnami/reportserver/README.md
index a7ad8d8f293f..e63f7004aef0 100644
--- a/bitnami/reportserver/README.md
+++ b/bitnami/reportserver/README.md
@@ -30,7 +30,7 @@ $ docker-compose up -d
 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/).
 
 
-* [`3-debian-10`, `3.1.2-6022-debian-10-r61`, `3`, `3.1.2-6022`, `latest` (3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-reportserver-community/blob/3.1.2-6022-debian-10-r61/3/debian-10/Dockerfile)
+* [`3-debian-10`, `3.1.2-6022-debian-10-r62`, `3`, `3.1.2-6022`, `latest` (3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-reportserver-community/blob/3.1.2-6022-debian-10-r62/3/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/reportserver-community GitHub repo](https://github.com/bitnami/bitnami-docker-reportserver-community).
 
diff --git a/bitnami/reportserver/docker-compose.yml b/bitnami/reportserver/docker-compose.yml
index 2735adf48fa9..5163ea922a1d 100644
--- a/bitnami/reportserver/docker-compose.yml
+++ b/bitnami/reportserver/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'
     environment:
       - MARIADB_USER=bn_reportserver
       - MARIADB_DATABASE=bitnami_reportserver
@@ -10,7 +10,7 @@ services:
     volumes:
       - 'mariadb_data:/bitnami'
   reportserver:
-    image: 'bitnami/reportserver:3'
+    image: 'docker.io/bitnami/reportserver:3-debian-10'
     environment:
       - MARIADB_HOST=mariadb
       - MARIADB_PORT_NUMBER=3306