diff --git a/bitnami/suitecrm/7/debian-10/Dockerfile b/bitnami/suitecrm/7/debian-10/Dockerfile
index 81c166a26613..705ec348c67d 100644
--- a/bitnami/suitecrm/7/debian-10/Dockerfile
+++ b/bitnami/suitecrm/7/debian-10/Dockerfile
@@ -23,8 +23,8 @@ RUN sed -i -e '/pam_loginuid.so/ s/^#*/#/' /etc/pam.d/cron
 
 COPY rootfs /
 RUN /opt/bitnami/scripts/mysql-client/postunpack.sh
-RUN /opt/bitnami/scripts/apache/postunpack.sh
 RUN /opt/bitnami/scripts/php/postunpack.sh
+RUN /opt/bitnami/scripts/apache/postunpack.sh
 RUN /opt/bitnami/scripts/apache-modphp/postunpack.sh
 RUN /opt/bitnami/scripts/suitecrm/postunpack.sh
 ENV ALLOW_EMPTY_PASSWORD="no" \
@@ -32,7 +32,7 @@ ENV ALLOW_EMPTY_PASSWORD="no" \
     APACHE_HTTPS_PORT_NUMBER="" \
     APACHE_HTTP_PORT_NUMBER="" \
     BITNAMI_APP_NAME="suitecrm" \
-    BITNAMI_IMAGE_VERSION="7.11.18-debian-10-r83" \
+    BITNAMI_IMAGE_VERSION="7.11.18-debian-10-r85" \
     MARIADB_HOST="mariadb" \
     MARIADB_PORT_NUMBER="3306" \
     MARIADB_ROOT_PASSWORD="" \
diff --git a/bitnami/suitecrm/7/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh b/bitnami/suitecrm/7/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
index bf464b08d8e9..77be1cd98eb8 100644
--- a/bitnami/suitecrm/7/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
+++ b/bitnami/suitecrm/7/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
@@ -151,7 +151,7 @@ mysql_get_version() {
     ver_string=$("${DB_BIN_DIR}/mysql" "--version")
     ver_split=(${ver_string// / })
 
-    if [[ "$ver_string" == *" Distrib "* ]]; then
+    if [[ "$ver_string" = *" Distrib "* ]]; then
         echo "${ver_split[4]::-1}"
     else
         echo "${ver_split[2]}"
@@ -169,7 +169,8 @@ mysql_get_version() {
 #########################
 get_env_var() {
     local -r id="${1:?id is required}"
-    echo "${DB_FLAVOR^^}_${id}"
+    local -r prefix="${DB_FLAVOR//-/_}"
+    echo "${prefix^^}_${id}"
 }
 
 ########################
@@ -444,11 +445,11 @@ mysql_install_db() {
     local command="${DB_BIN_DIR}/mysql_install_db"
     local -a args=("--defaults-file=${DB_CONF_FILE}" "--basedir=${DB_BASE_DIR}" "--datadir=${DB_DATA_DIR}")
     am_i_root && args=("${args[@]}" "--user=$DB_DAEMON_USER")
-    if [[ "$DB_FLAVOR" = "mysql" ]]; then
+    if [[ "$DB_FLAVOR" = "mariadb" ]]; then
+        args+=("--auth-root-authentication-method=normal")
+    else
         command="${DB_BIN_DIR}/mysqld"
         args+=("--initialize-insecure")
-    else
-        args+=("--auth-root-authentication-method=normal")
     fi
     debug_execute "$command" "${args[@]}"
 }
@@ -470,7 +471,7 @@ mysql_upgrade() {
     minor_version="$(get_sematic_version "$(mysql_get_version)" 2)"
     patch_version="$(get_sematic_version "$(mysql_get_version)" 3)"
     info "Running mysql_upgrade"
-    if [[ "$DB_FLAVOR" = "mysql" ]] && [[
+    if [[ "$DB_FLAVOR" = *"mysql"* ]] && [[
         "$major_version" -gt "8"
         || ( "$major_version" -eq "8" && "$minor_version" -gt "0" )
         || ( "$major_version" -eq "8" && "$minor_version" -eq "0" && "$patch_version" -ge "16" )
@@ -655,7 +656,7 @@ mysql_ensure_root_user_exists() {
     fi
 
     debug "Configuring root user credentials"
-    if [ "$DB_FLAVOR" == "mariadb" ]; then
+    if [[ "$DB_FLAVOR" = "mariadb" ]]; then
         mysql_execute "mysql" "root" <<EOF
 -- create root@localhost user for local admin access
 -- create user 'root'@'localhost' $([ "$password" != "" ] && echo "identified by \"$password\"");
diff --git a/bitnami/suitecrm/README.md b/bitnami/suitecrm/README.md
index da139f736222..6642f50dd0c3 100644
--- a/bitnami/suitecrm/README.md
+++ b/bitnami/suitecrm/README.md
@@ -42,7 +42,7 @@ Bitnami containers can be used with [Kubeapps](https://kubeapps.com/) for deploy
 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/).
 
 
-* [`7`, `7-debian-10`, `7.11.18`, `7.11.18-debian-10-r83`, `latest` (7/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-suitecrm/blob/7.11.18-debian-10-r83/7/debian-10/Dockerfile)
+* [`7`, `7-debian-10`, `7.11.18`, `7.11.18-debian-10-r85`, `latest` (7/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-suitecrm/blob/7.11.18-debian-10-r85/7/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/suitecrm GitHub repo](https://github.com/bitnami/bitnami-docker-suitecrm).