diff --git a/bitnami/mysql/5.7/debian-10/Dockerfile b/bitnami/mysql/5.7/debian-10/Dockerfile
index b5932eef42df..3e030dc5bf5e 100644
--- a/bitnami/mysql/5.7/debian-10/Dockerfile
+++ b/bitnami/mysql/5.7/debian-10/Dockerfile
@@ -18,7 +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="5.7.36-debian-10-r35" \
+    BITNAMI_IMAGE_VERSION="5.7.36-debian-10-r36" \
     PATH="/opt/bitnami/common/bin:/opt/bitnami/mysql/bin:/opt/bitnami/mysql/sbin:$PATH"
 
 EXPOSE 3306
diff --git a/bitnami/mysql/5.7/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/mysql/5.7/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh
index b438c913341d..1b504b1df458 100644
--- a/bitnami/mysql/5.7/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh
+++ b/bitnami/mysql/5.7/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/mysql/5.7/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/mysql/5.7/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh
index 6bd564773acb..0a1a92a747f9 100644
--- a/bitnami/mysql/5.7/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh
+++ b/bitnami/mysql/5.7/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh
@@ -446,3 +446,19 @@ generate_sha_hash() {
     echo -n "$str" | "sha${algorithm}sum" | awk '{print $1}'
 }
 
+########################
+# Converts a string to its hexadecimal representation
+# Arguments:
+#   $1 - string
+# Returns:
+#   hexadecimal representation of the string
+#########################
+convert_to_hex() {
+    local -r str=${1:?missing input string}
+    local -i iterator
+    local char
+    for ((iterator=0; iterator<${#str}; iterator++)); do
+        char=${str:iterator:1}
+        printf '%x' "'${char}"
+    done
+}
diff --git a/bitnami/mysql/5.7/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/mysql/5.7/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh
index 459f99c7d1cd..503650210583 100644
--- a/bitnami/mysql/5.7/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh
+++ b/bitnami/mysql/5.7/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh
@@ -177,6 +177,8 @@ web_server_reload() {
 #   --document-root - Path to document root directory
 # Apache-specific flags:
 #   --apache-additional-configuration - Additional vhost configuration (no default)
+#   --apache-additional-http-configuration - Additional HTTP vhost configuration (no default)
+#   --apache-additional-https-configuration - Additional HTTPS vhost configuration (no default)
 #   --apache-before-vhost-configuration - Configuration to add before the <VirtualHost> directive (no default)
 #   --apache-allow-override - Whether to allow .htaccess files (only allowed when --move-htaccess is set to 'no' and type is not defined)
 #   --apache-extra-directory-configuration - Extra configuration for the document root directory
@@ -224,6 +226,8 @@ ensure_web_server_app_configuration_exists() {
 
             # Specific Apache flags
             --apache-additional-configuration \
+            | --apache-additional-http-configuration \
+            | --apache-additional-https-configuration \
             | --apache-before-vhost-configuration \
             | --apache-allow-override \
             | --apache-extra-directory-configuration \
diff --git a/bitnami/mysql/5.7/debian-10/rootfs/opt/bitnami/scripts/libmysql.sh b/bitnami/mysql/5.7/debian-10/rootfs/opt/bitnami/scripts/libmysql.sh
index 033bb45d25c7..bac6be5d996a 100644
--- a/bitnami/mysql/5.7/debian-10/rootfs/opt/bitnami/scripts/libmysql.sh
+++ b/bitnami/mysql/5.7/debian-10/rootfs/opt/bitnami/scripts/libmysql.sh
@@ -160,7 +160,7 @@ plugin_dir=${DB_BASE_DIR}/lib/plugin
 [client]
 port=${DB_DEFAULT_PORT_NUMBER}
 socket=${DB_SOCKET_FILE}
-default_character_set=UTF8
+default_character_set=${DB_DEFAULT_CHARACTER_SET}
 plugin_dir=${DB_BASE_DIR}/lib/plugin
 
 [manager]
@@ -732,7 +732,7 @@ mysql_install_db() {
 #   None
 #########################
 mysql_upgrade() {
-    local -a args=("--defaults-file=${DB_CONF_FILE}" "-u" "$DB_ROOT_USER" "--force")
+    local -a args=("--defaults-file=${DB_CONF_FILE}" "-u" "$DB_ROOT_USER")
     local major_version minor_version patch_version
     major_version="$(get_sematic_version "$(mysql_get_version)" 1)"
     minor_version="$(get_sematic_version "$(mysql_get_version)" 2)"
@@ -748,7 +748,7 @@ mysql_upgrade() {
     else
         mysql_start_bg
         is_boolean_yes "${ROOT_AUTH_ENABLED:-false}" && args+=("-p$(get_master_env_var_value ROOT_PASSWORD)")
-        debug_execute "${DB_BIN_DIR}/mysql_upgrade" "${args[@]}"
+        debug_execute "${DB_BIN_DIR}/mysql_upgrade" "${args[@]}" --force
     fi
 }
 
diff --git a/bitnami/mysql/README.md b/bitnami/mysql/README.md
index bf9bb895f071..a3a7f76e7c1d 100644
--- a/bitnami/mysql/README.md
+++ b/bitnami/mysql/README.md
@@ -51,7 +51,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 
 * [`8.0`, `8.0-debian-10`, `8.0.27`, `8.0.27-debian-10-r55`, `latest` (8.0/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mysql/blob/8.0.27-debian-10-r55/8.0/debian-10/Dockerfile)
-* [`5.7`, `5.7-debian-10`, `5.7.36`, `5.7.36-debian-10-r35` (5.7/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mysql/blob/5.7.36-debian-10-r35/5.7/debian-10/Dockerfile)
+* [`5.7`, `5.7-debian-10`, `5.7.36`, `5.7.36-debian-10-r36` (5.7/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mysql/blob/5.7.36-debian-10-r36/5.7/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/mysql GitHub repo](https://github.com/bitnami/bitnami-docker-mysql).