diff --git a/bitnami/drupal/9/debian-10/Dockerfile b/bitnami/drupal/9/debian-10/Dockerfile
index f1b2deb9d53a..0dd0aa6674c9 100644
--- a/bitnami/drupal/9/debian-10/Dockerfile
+++ b/bitnami/drupal/9/debian-10/Dockerfile
@@ -29,7 +29,7 @@ ENV ALLOW_EMPTY_PASSWORD="no" \
     APACHE_HTTPS_PORT_NUMBER="" \
     APACHE_HTTP_PORT_NUMBER="" \
     BITNAMI_APP_NAME="drupal" \
-    BITNAMI_IMAGE_VERSION="9.1.6-debian-10-r1" \
+    BITNAMI_IMAGE_VERSION="9.1.6-debian-10-r2" \
     MARIADB_HOST="mariadb" \
     MARIADB_PORT_NUMBER="3306" \
     MARIADB_ROOT_PASSWORD="" \
diff --git a/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh b/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
index 18898fc24967..3dc97a940cbf 100644
--- a/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
+++ b/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
@@ -44,8 +44,15 @@ mysql_client_validate() {
         fi
     }
 
+    check_multi_value() {
+        if [[ " ${2} " != *" ${!1} "* ]]; then
+            print_validation_error "The allowed values for ${1} are: ${2}"
+        fi
+    }
+
     # Only validate environment variables if any action needs to be performed
     check_yes_no_value "MYSQL_CLIENT_ENABLE_SSL_WRAPPER"
+    check_multi_value "MYSQL_CLIENT_FLAVOR" "mariadb mysql"
 
     if [[ -n "$MYSQL_CLIENT_CREATE_DATABASE_USER" || -n "$MYSQL_CLIENT_CREATE_DATABASE_NAME" ]]; then
         if is_boolean_yes "$ALLOW_EMPTY_PASSWORD"; then
diff --git a/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/libphp.sh b/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/libphp.sh
index 9b502a7d3ed4..c0a910a20394 100644
--- a/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/libphp.sh
+++ b/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/libphp.sh
@@ -78,13 +78,14 @@ php_initialize() {
 php_set_runtime_config() {
     local -r conf_file="${1:?missing conf file}"
 
+    ! is_empty_value "$PHP_ENABLE_OPCACHE" && info "Setting PHP opcache.enable option" && php_conf_set opcache.enable "$PHP_ENABLE_OPCACHE" "$conf_file"
+    ! is_empty_value "$PHP_EXPOSE_PHP" && info "Setting PHP expose_php option" && php_conf_set expose_php "$PHP_EXPOSE_PHP" "$conf_file"
     ! is_empty_value "$PHP_MAX_EXECUTION_TIME" && info "Setting PHP max_execution_time option" && php_conf_set max_execution_time "$PHP_MAX_EXECUTION_TIME" "$conf_file"
     ! is_empty_value "$PHP_MAX_INPUT_TIME" && info "Setting PHP max_input_time option" && php_conf_set max_input_time "$PHP_MAX_INPUT_TIME" "$conf_file"
     ! is_empty_value "$PHP_MAX_INPUT_VARS" && info "Setting PHP max_input_vars option" && php_conf_set max_input_vars "$PHP_MAX_INPUT_VARS" "$conf_file"
     ! is_empty_value "$PHP_MEMORY_LIMIT" && info "Setting PHP memory_limit option" && php_conf_set memory_limit "$PHP_MEMORY_LIMIT" "$conf_file"
     ! is_empty_value "$PHP_POST_MAX_SIZE" && info "Setting PHP post_max_size option" && php_conf_set post_max_size "$PHP_POST_MAX_SIZE" "$conf_file"
     ! is_empty_value "$PHP_UPLOAD_MAX_FILESIZE" && info "Setting PHP upload_max_filesize option" && php_conf_set upload_max_filesize "$PHP_UPLOAD_MAX_FILESIZE" "$conf_file"
-    ! is_empty_value "$PHP_EXPOSE_PHP" && info "Setting PHP expose_php option" && php_conf_set expose_php "$PHP_EXPOSE_PHP" "$conf_file"
 
     true
 }
diff --git a/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/mysql-client-env.sh b/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/mysql-client-env.sh
index d074ba93e4cf..cae196ceeba2 100644
--- a/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/mysql-client-env.sh
+++ b/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/mysql-client-env.sh
@@ -21,6 +21,7 @@ export BITNAMI_DEBUG="${BITNAMI_DEBUG:-false}"
 # By setting an environment variable matching *_FILE to a file path, the prefixed environment
 # variable will be overridden with the value specified in that file
 mysql_env_vars=(
+    MYSQL_CLIENT_FLAVOR
     ALLOW_EMPTY_PASSWORD
     MYSQL_CLIENT_DATABASE_AUTHENTICATION_PLUGIN
     MYSQL_CLIENT_DATABASE_HOST
@@ -56,7 +57,8 @@ for env_var in "${mysql_env_vars[@]}"; do
     fi
 done
 unset mysql_env_vars
-export DB_FLAVOR="mariadb"
+export MYSQL_CLIENT_FLAVOR="${MYSQL_CLIENT_FLAVOR:-mariadb}"
+export DB_FLAVOR="$MYSQL_CLIENT_FLAVOR"
 
 # Paths
 export DB_BASE_DIR="${BITNAMI_ROOT_DIR}/mysql"
diff --git a/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/php-env.sh b/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/php-env.sh
index bfa1c683afc8..d38b3b2e02c9 100644
--- a/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/php-env.sh
+++ b/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/php-env.sh
@@ -22,13 +22,15 @@ export BITNAMI_DEBUG="${BITNAMI_DEBUG:-false}"
 # variable will be overridden with the value specified in that file
 php_env_vars=(
     PHP_FPM_LISTEN_ADDRESS
+    PHP_ENABLE_OPCACHE
+    PHP_EXPOSE_PHP
     PHP_MAX_EXECUTION_TIME
     PHP_MAX_INPUT_TIME
     PHP_MAX_INPUT_VARS
     PHP_MEMORY_LIMIT
     PHP_POST_MAX_SIZE
     PHP_UPLOAD_MAX_FILESIZE
-    PHP_EXPOSE_PHP
+    PHP_OPCACHE_ENABLED
 )
 for env_var in "${php_env_vars[@]}"; do
     file_env_var="${env_var}_FILE"
@@ -70,12 +72,14 @@ export PHP_FPM_DAEMON_USER="daemon"
 export PHP_FPM_DAEMON_GROUP="daemon"
 
 # PHP configuration
+PHP_ENABLE_OPCACHE="${PHP_ENABLE_OPCACHE:-"${PHP_OPCACHE_ENABLED:-}"}"
+export PHP_ENABLE_OPCACHE="${PHP_ENABLE_OPCACHE:-}"
+export PHP_EXPOSE_PHP="${PHP_EXPOSE_PHP:-}"
 export PHP_MAX_EXECUTION_TIME="${PHP_MAX_EXECUTION_TIME:-}"
 export PHP_MAX_INPUT_TIME="${PHP_MAX_INPUT_TIME:-}"
 export PHP_MAX_INPUT_VARS="${PHP_MAX_INPUT_VARS:-}"
 export PHP_MEMORY_LIMIT="${PHP_MEMORY_LIMIT:-}"
 export PHP_POST_MAX_SIZE="${PHP_POST_MAX_SIZE:-}"
 export PHP_UPLOAD_MAX_FILESIZE="${PHP_UPLOAD_MAX_FILESIZE:-}"
-export PHP_EXPOSE_PHP="${PHP_EXPOSE_PHP:-}"
 
 # Custom environment variables may be defined below
diff --git a/bitnami/drupal/README.md b/bitnami/drupal/README.md
index eee21ea78d5b..b112e2b7f164 100644
--- a/bitnami/drupal/README.md
+++ b/bitnami/drupal/README.md
@@ -41,7 +41,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/).
 
 
-* [`9`, `9-debian-10`, `9.1.6`, `9.1.6-debian-10-r1`, `latest` (9/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/9.1.6-debian-10-r1/9/debian-10/Dockerfile)
+* [`9`, `9-debian-10`, `9.1.6`, `9.1.6-debian-10-r2`, `latest` (9/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/9.1.6-debian-10-r2/9/debian-10/Dockerfile)
 * [`8`, `8-debian-10`, `8.9.13`, `8.9.13-debian-10-r73` (8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/8.9.13-debian-10-r73/8/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/drupal GitHub repo](https://github.com/bitnami/bitnami-docker-drupal).
@@ -243,6 +243,7 @@ Available environment variables:
 
 ##### Create a database for Drupal using mysql-client
 
+- `MYSQL_CLIENT_FLAVOR`: SQL database flavor. Valid values: `mariadb` or `mysql`. Default: **mariadb**.
 - `MYSQL_CLIENT_DATABASE_HOST`: Hostname for MariaDB server. Default: **mariadb**
 - `MYSQL_CLIENT_DATABASE_PORT_NUMBER`: Port used by MariaDB server. Default: **3306**
 - `MYSQL_CLIENT_DATABASE_ROOT_USER`: Database admin user. Default: **root**