diff --git a/bitnami/drupal/8/debian-10/Dockerfile b/bitnami/drupal/8/debian-10/Dockerfile
index 08a74411fb61..ee08a2bc5a73 100644
--- a/bitnami/drupal/8/debian-10/Dockerfile
+++ b/bitnami/drupal/8/debian-10/Dockerfile
@@ -11,7 +11,7 @@ COPY prebuildfs /
 RUN install_packages acl ca-certificates curl dirmngr gnupg gzip libargon2-1 libaudit1 libbsd0 libbz2-1.0 libc6 libcap-ng0 libcom-err2 libcurl4 libexpat1 libffi6 libfftw3-double3 libfontconfig1 libfreetype6 libgcc1 libgcrypt20 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed4 libicu63 libidn2-0 libjemalloc2 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblcms2-2 libldap-2.4-2 liblqr-1-0 libltdl7 liblzma5 libmagickcore-6.q16-6 libmagickwand-6.q16-6 libmcrypt4 libmemcached11 libmemcachedutil2 libncurses6 libnettle6 libnghttp2-14 libp11-kit0 libpam0g libpcre3 libpng16-16 libpq5 libpsl5 libreadline7 librtmp1 libsasl2-2 libsodium23 libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libuuid1 libwebp6 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 procps tar unzip zlib1g
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "php" "7.3.28-2" --checksum 6ffc1ee70ea2e3db51e3a5d21414467eb8c15fc7c4728583f11b99851c391d12
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "apache" "2.4.48-0" --checksum 85aa9ec2b419b3e53b5aa8f8e52bb35cddba3a646f204dfaec029e292d250017
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "mysql-client" "10.3.29-0" --checksum 5bf8f1ed022c8ad75a4db5b8b72ae54ce427bff628d7e4025c5b5e67b876708d
+RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "mysql-client" "10.3.30-0" --checksum 47107f86621bb184307e47bbb15244d076575f0e0f7d339f198ef312b6f3f285
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "libphp" "7.3.28-1" --checksum a2eb2d88d68d878f264bb33a0264f9b7bb95994e4caf17635dc5053568edc7ca
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "render-template" "1.0.0-3" --checksum 8179ad1371c9a7d897fe3b1bf53bbe763f94edafef19acad2498dd48b3674efe
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.13.0-0" --checksum fd7257c2736164d02832dbf72e2c1ed9d875bf3e32f0988520796bc503330129
@@ -19,8 +19,8 @@ RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "drupal" "8.9.16-
 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.16-debian-10-r20" \
+    BITNAMI_IMAGE_VERSION="8.9.16-debian-10-r21" \
     MARIADB_HOST="mariadb" \
     MARIADB_PORT_NUMBER="3306" \
     MARIADB_ROOT_PASSWORD="" \
diff --git a/bitnami/drupal/8/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/drupal/8/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
index f2e731d49ad1..8c5fa5d5677e 100644
--- a/bitnami/drupal/8/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/drupal/8/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -29,10 +29,10 @@
     },
     "mysql-client": {
         "arch": "amd64",
-        "digest": "5bf8f1ed022c8ad75a4db5b8b72ae54ce427bff628d7e4025c5b5e67b876708d",
+        "digest": "47107f86621bb184307e47bbb15244d076575f0e0f7d339f198ef312b6f3f285",
         "distro": "debian-10",
         "type": "NAMI",
-        "version": "10.3.29-0"
+        "version": "10.3.30-0"
     },
     "php": {
         "arch": "amd64",
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 dbc8ac3011e1..a0c941c5ac05 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
@@ -348,6 +348,8 @@ is_mysql_not_running() {
 # Wait for MySQL/MariaDB to be running
 # Globals:
 #   DB_TMP_DIR
+#   DB_STARTUP_WAIT_RETRIES
+#   DB_STARTUP_WAIT_SLEEP_TIME
 # Arguments:
 #   None
 # Returns:
@@ -355,8 +357,8 @@ is_mysql_not_running() {
 #########################
 wait_for_mysql() {
     local pid
-    local -r retries=300
-    local -r sleep_time=2
+    local -r retries="${DB_STARTUP_WAIT_RETRIES:-300}"
+    local -r sleep_time="${DB_STARTUP_WAIT_SLEEP_TIME:-2}"
     if ! retry_while is_mysql_running "$retries" "$sleep_time"; then
         error "MySQL failed to start"
         return 1
diff --git a/bitnami/drupal/README.md b/bitnami/drupal/README.md
index 57291868609e..67ddfccfd59e 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.2.0`, `9.2.0-debian-10-r2`, `latest` (9/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/9.2.0-debian-10-r2/9/debian-10/Dockerfile)
-* [`8`, `8-debian-10`, `8.9.16`, `8.9.16-debian-10-r20` (8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/8.9.16-debian-10-r20/8/debian-10/Dockerfile)
+* [`8`, `8-debian-10`, `8.9.16`, `8.9.16-debian-10-r21` (8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/8.9.16-debian-10-r21/8/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/drupal GitHub repo](https://github.com/bitnami/bitnami-docker-drupal).