diff --git a/bitnami/reportserver/4/debian-10/Dockerfile b/bitnami/reportserver/4/debian-10/Dockerfile
index 68c0d7da67e4..5d4f09af2ac9 100644
--- a/bitnami/reportserver/4/debian-10/Dockerfile
+++ b/bitnami/reportserver/4/debian-10/Dockerfile
@@ -12,9 +12,9 @@ COPY prebuildfs /
 # Install required system packages and dependencies
 RUN install_packages acl ca-certificates curl gzip libaudit1 libc6 libcap-ng0 libgcc1 libicu63 libjemalloc2 liblzma5 libncurses6 libpam0g libssl1.1 libstdc++6 libtinfo6 libxml2 procps tar xmlstarlet zlib1g
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "java" "11.0.14-7" --checksum 900545c4f346a0ece8abf2caf64fd9d4ab7514967d4614d716bf7362b24f828b
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "tomcat" "9.0.59-0" --checksum f6f3600acc829e773a223f2f76f65b512451cfb9b1a0b6feca580de4fa7bf95e
+RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "tomcat" "9.0.59-1" --checksum b5969e9f721752c4feadafdefa987b13f35203dfa1c32797784f931653e62ecd
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "mysql-client" "10.3.34-4" --checksum bb0089c26028b568dbe8b8875d39cca3c7835c582dda4fcbdcbed599320c57fe
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "reportserver" "4.0.0-6055-4" --checksum 569c3c39174c01f7f7a4efd5f18848a4454cb175b9dcf04004a09ab016c2ee7a
+RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "reportserver" "4.0.0-6057-0" --checksum 7c67b6de02c713b4c2d0147853c94ecd7fbf2a5583fca73fcc999826db66936b
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "render-template" "1.0.1-10" --checksum 97c2ae4b001c5937e888b920bee7b1a40a076680caac53ded6d10f6207d54565
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-7" --checksum d6280b6f647a62bf6edc74dc8e526bfff63ddd8067dcb8540843f47203d9ccf1
 RUN apt-get update && apt-get upgrade -y && \
@@ -27,7 +27,7 @@ RUN /opt/bitnami/scripts/mysql-client/postunpack.sh
 RUN /opt/bitnami/scripts/reportserver/postunpack.sh
 RUN /opt/bitnami/scripts/tomcat/postunpack.sh
 ENV BITNAMI_APP_NAME="reportserver" \
-    BITNAMI_IMAGE_VERSION="4.0.0-6055-debian-10-r17" \
+    BITNAMI_IMAGE_VERSION="4.0.0-6057-debian-10-r0" \
     JAVA_HOME="/opt/bitnami/java" \
     PATH="/opt/bitnami/java/bin:/opt/bitnami/tomcat/bin:/opt/bitnami/mysql/bin:/opt/bitnami/common/bin:$PATH" \
     TOMCAT_START_RETRIES="60"
diff --git a/bitnami/reportserver/4/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/reportserver/4/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
index 152103ce6f98..dc5ff7b8c7ec 100644
--- a/bitnami/reportserver/4/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/reportserver/4/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -29,16 +29,16 @@
     },
     "reportserver": {
         "arch": "amd64",
-        "digest": "569c3c39174c01f7f7a4efd5f18848a4454cb175b9dcf04004a09ab016c2ee7a",
+        "digest": "7c67b6de02c713b4c2d0147853c94ecd7fbf2a5583fca73fcc999826db66936b",
         "distro": "debian-10",
         "type": "NAMI",
-        "version": "4.0.0-6055-4"
+        "version": "4.0.0-6057-0"
     },
     "tomcat": {
         "arch": "amd64",
-        "digest": "f6f3600acc829e773a223f2f76f65b512451cfb9b1a0b6feca580de4fa7bf95e",
+        "digest": "b5969e9f721752c4feadafdefa987b13f35203dfa1c32797784f931653e62ecd",
         "distro": "debian-10",
         "type": "NAMI",
-        "version": "9.0.59-0"
+        "version": "9.0.59-1"
     }
 }
\ No newline at end of file
diff --git a/bitnami/reportserver/4/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh b/bitnami/reportserver/4/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
index 9609635e63a3..fee929c4ee1a 100644
--- a/bitnami/reportserver/4/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
+++ b/bitnami/reportserver/4/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
@@ -241,10 +241,16 @@ mysql_execute_print_output() {
     [[ "${#extra_opts[@]}" -gt 0 ]] && args+=("${extra_opts[@]}")
 
     # Obtain the command specified via stdin
-    local mysql_cmd
-    mysql_cmd="$(</dev/stdin)"
-    debug "Executing SQL command:\n$mysql_cmd"
-    "$DB_BIN_DIR/mysql" "${args[@]}" <<<"$mysql_cmd"
+    if [[ "${BITNAMI_DEBUG:-false}" = true ]]; then
+        local mysql_cmd
+        mysql_cmd="$(</dev/stdin)"
+        debug "Executing SQL command:\n$mysql_cmd"
+        "$DB_BIN_DIR/mysql" "${args[@]}" <<<"$mysql_cmd"
+    else
+        # Do not store the command(s) as a variable, to avoid issues when importing large files
+        # https://github.com/bitnami/bitnami-docker-mariadb/issues/251
+        "$DB_BIN_DIR/mysql" "${args[@]}"
+    fi
 }
 
 ########################
diff --git a/bitnami/reportserver/4/debian-10/rootfs/opt/bitnami/scripts/libtomcat.sh b/bitnami/reportserver/4/debian-10/rootfs/opt/bitnami/scripts/libtomcat.sh
index d42af0850771..2860e6b55119 100644
--- a/bitnami/reportserver/4/debian-10/rootfs/opt/bitnami/scripts/libtomcat.sh
+++ b/bitnami/reportserver/4/debian-10/rootfs/opt/bitnami/scripts/libtomcat.sh
@@ -180,8 +180,12 @@ EOF
         # Use tomcat:root ownership for compatibility when running as a non-root user
         am_i_root && configure_permissions_ownership "$TOMCAT_WEBAPPS_DIR" -d "775" -f "664" -u "$TOMCAT_DAEMON_USER" -g "root"
 
-        info "Deploying Tomcat from scratch"
-        cp -rp "$TOMCAT_BASE_DIR"/webapps_default/* "$TOMCAT_WEBAPPS_DIR"
+        if is_boolean_yes "$TOMCAT_INSTALL_DEFAULT_WEBAPPS"; then
+            info "Deploying Tomcat from scratch"
+            cp -rp "$TOMCAT_BASE_DIR"/webapps_default/* "$TOMCAT_WEBAPPS_DIR"
+        else
+            info "Skipping deployment of default webapps"
+        fi
 
         # Access control is configured in the application's context.xml with a Valve element
         # context.xml docs: https://tomcat.apache.org/tomcat-9.0-doc/config/context.html
diff --git a/bitnami/reportserver/4/debian-10/rootfs/opt/bitnami/scripts/tomcat-env.sh b/bitnami/reportserver/4/debian-10/rootfs/opt/bitnami/scripts/tomcat-env.sh
index 99a2916db4e4..904c13fa73f1 100644
--- a/bitnami/reportserver/4/debian-10/rootfs/opt/bitnami/scripts/tomcat-env.sh
+++ b/bitnami/reportserver/4/debian-10/rootfs/opt/bitnami/scripts/tomcat-env.sh
@@ -31,6 +31,7 @@ tomcat_env_vars=(
     TOMCAT_ENABLE_AJP
     TOMCAT_START_RETRIES
     TOMCAT_EXTRA_JAVA_OPTS
+    TOMCAT_INSTALL_DEFAULT_WEBAPPS
     JAVA_OPTS
 )
 for env_var in "${tomcat_env_vars[@]}"; do
@@ -77,6 +78,7 @@ export TOMCAT_ENABLE_AUTH="${TOMCAT_ENABLE_AUTH:-yes}"
 export TOMCAT_ENABLE_AJP="${TOMCAT_ENABLE_AJP:-no}"
 export TOMCAT_START_RETRIES="${TOMCAT_START_RETRIES:-12}"
 export TOMCAT_EXTRA_JAVA_OPTS="${TOMCAT_EXTRA_JAVA_OPTS:-}"
+export TOMCAT_INSTALL_DEFAULT_WEBAPPS="${TOMCAT_INSTALL_DEFAULT_WEBAPPS:-yes}"
 
 # Default JVM configuration
 export JAVA_HOME="${BITNAMI_ROOT_DIR}/java"
diff --git a/bitnami/reportserver/README.md b/bitnami/reportserver/README.md
index 78452ff8062b..fd743ee662e6 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/).
 
 
-- [`4`, `4-debian-10`, `4.0.0-6055`, `4.0.0-6055-debian-10-r17` (4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-reportserver/blob/4.0.0-6055-debian-10-r17/4/debian-10/Dockerfile)
+- [`4`, `4-debian-10`, `4.0.0-6057`, `4.0.0-6057-debian-10-r0` (4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-reportserver/blob/4.0.0-6057-debian-10-r0/4/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/reportserver GitHub repo](https://github.com/bitnami/bitnami-docker-reportserver).