diff --git a/bitnami/reportserver/3/debian-10/Dockerfile b/bitnami/reportserver/3/debian-10/Dockerfile
index 2ff3d7f21a6b..0c0a596d08fa 100644
--- a/bitnami/reportserver/3/debian-10/Dockerfile
+++ b/bitnami/reportserver/3/debian-10/Dockerfile
@@ -26,7 +26,7 @@ RUN /opt/bitnami/scripts/reportserver/postunpack.sh
 RUN /opt/bitnami/scripts/tomcat/postunpack.sh
 ENV ALLOW_EMPTY_PASSWORD="no" \
     BITNAMI_APP_NAME="reportserver" \
-    BITNAMI_IMAGE_VERSION="3.7.1-6048-debian-10-r20" \
+    BITNAMI_IMAGE_VERSION="3.7.1-6048-debian-10-r21" \
     JAVA_HOME="/opt/bitnami/java" \
     MARIADB_HOST="mariadb" \
     MARIADB_PORT_NUMBER="3306" \
diff --git a/bitnami/reportserver/3/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/reportserver/3/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh
index b438c913341d..1b504b1df458 100644
--- a/bitnami/reportserver/3/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh
+++ b/bitnami/reportserver/3/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh
@@ -20,8 +20,13 @@
 owned_by() {
     local path="${1:?path is missing}"
     local owner="${2:?owner is missing}"
+    local group="${3:-}"
 
-    chown "$owner":"$owner" "$path"
+    if [[ -n $group ]]; then
+        chown "$owner":"$group" "$path"
+    else
+        chown "$owner":"$owner" "$path"
+    fi
 }
 
 ########################
@@ -34,11 +39,12 @@ owned_by() {
 #########################
 ensure_dir_exists() {
     local dir="${1:?directory is missing}"
-    local owner="${2:-}"
+    local owner_user="${2:-}"
+    local owner_group="${3:-}"
 
     mkdir -p "${dir}"
-    if [[ -n $owner ]]; then
-        owned_by "$dir" "$owner"
+    if [[ -n $owner_user ]]; then
+        owned_by "$dir" "$owner_user" "$owner_group"
     fi
 }
 
diff --git a/bitnami/reportserver/README.md b/bitnami/reportserver/README.md
index 4a370bc64007..f83e88f3082a 100644
--- a/bitnami/reportserver/README.md
+++ b/bitnami/reportserver/README.md
@@ -37,7 +37,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/).
 
 
-- [`3`, `3-debian-10`, `3.7.1-6048`, `3.7.1-6048-debian-10-r20`, `latest` (3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-reportserver/blob/3.7.1-6048-debian-10-r20/3/debian-10/Dockerfile)
+- [`3`, `3-debian-10`, `3.7.1-6048`, `3.7.1-6048-debian-10-r21`, `latest` (3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-reportserver/blob/3.7.1-6048-debian-10-r21/3/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/reportserver GitHub repo](https://github.com/bitnami/bitnami-docker-reportserver).