diff --git a/bitnami/drupal/8/debian-10/Dockerfile b/bitnami/drupal/8/debian-10/Dockerfile
index eeb27f3daa1a..fae8f9383707 100644
--- a/bitnami/drupal/8/debian-10/Dockerfile
+++ b/bitnami/drupal/8/debian-10/Dockerfile
@@ -19,8 +19,8 @@ RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "drupal" "8.9.13-
 RUN chmod g+rwX /opt/bitnami
 
 COPY rootfs /
-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/drupal/postunpack.sh
 RUN /opt/bitnami/scripts/mysql-client/postunpack.sh
@@ -29,7 +29,7 @@ ENV ALLOW_EMPTY_PASSWORD="no" \
     APACHE_HTTPS_PORT_NUMBER="" \
     APACHE_HTTP_PORT_NUMBER="" \
     BITNAMI_APP_NAME="drupal" \
-    BITNAMI_IMAGE_VERSION="8.9.13-debian-10-r30" \
+    BITNAMI_IMAGE_VERSION="8.9.13-debian-10-r31" \
     MARIADB_HOST="mariadb" \
     MARIADB_PORT_NUMBER="3306" \
     MARIADB_ROOT_PASSWORD="" \
diff --git a/bitnami/drupal/8/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh b/bitnami/drupal/8/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
index 77be1cd98eb8..2afb2e9689c7 100644
--- a/bitnami/drupal/8/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
+++ b/bitnami/drupal/8/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
@@ -1051,7 +1051,7 @@ mysql_client_extra_opts() {
     }
     local -a opts=()
     local key value
-    if is_boolean_yes "$DB_ENABLE_SSL"; then
+    if is_boolean_yes "${DB_ENABLE_SSL:-no}"; then
         if [[ "$(mysql_client_flavor)" = "mysql" ]]; then
             opts+=("--ssl-mode=REQUIRED")
         else
diff --git a/bitnami/drupal/README.md b/bitnami/drupal/README.md
index 4433d147ea08..5c41c2e62ead 100644
--- a/bitnami/drupal/README.md
+++ b/bitnami/drupal/README.md
@@ -42,7 +42,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 
 * [`9`, `9-debian-10`, `9.1.4`, `9.1.4-debian-10-r23`, `latest` (9/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/9.1.4-debian-10-r23/9/debian-10/Dockerfile)
-* [`8`, `8-debian-10`, `8.9.13`, `8.9.13-debian-10-r30` (8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/8.9.13-debian-10-r30/8/debian-10/Dockerfile)
+* [`8`, `8-debian-10`, `8.9.13`, `8.9.13-debian-10-r31` (8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/8.9.13-debian-10-r31/8/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/drupal GitHub repo](https://github.com/bitnami/bitnami-docker-drupal).