diff --git a/bitnami/moodle/3/debian-10/Dockerfile b/bitnami/moodle/3/debian-10/Dockerfile
index 18e39501d626..8994a0e043fd 100644
--- a/bitnami/moodle/3/debian-10/Dockerfile
+++ b/bitnami/moodle/3/debian-10/Dockerfile
@@ -14,7 +14,7 @@ COPY prebuildfs /
 RUN install_packages acl ca-certificates cron curl gzip libaudit1 libbsd0 libbz2-1.0 libc6 libcap-ng0 libcom-err2 libcurl4 libedit2 libexpat1 libffi6 libfftw3-double3 libfontconfig1 libfreetype6 libgcc1 libgcrypt20 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed4 libicu63 libidn2-0 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 libonig5 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 locales procps tar zlib1g
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "php" "7.4.28-14" --checksum 3dc3e85c255ef06331fb70a605478f076b1a33810f2573e94ec2b295f1e00e4e
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "apache" "2.4.53-0" --checksum 716e4948a2c40f0a0cc5b1656052aeef916a79152250b0b6c1392dd1187f575a
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "postgresql-client" "13.6.0-4" --checksum 10c4c8870775aa837cc37c243b20cde2efd166482aab0df90974c105884ea210
+RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "postgresql-client" "13.6.0-5" --checksum ef8f465e059e386aa96e44ba6787ed68ba4bd80c8e73681672b760c8d3114bff
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "mysql-client" "10.6.7-4" --checksum 14329a8ec0a649ecb9ffb37085a547183748efedea8ed029801ab9b381ab7173
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "libphp" "7.4.28-4" --checksum 216cab0049a1737702a17c924ed7c20128347adc605e6b78fd40db3064c92f5c
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "render-template" "1.0.1-10" --checksum 97c2ae4b001c5937e888b920bee7b1a40a076680caac53ded6d10f6207d54565
@@ -32,8 +32,8 @@ RUN echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen && locale-gen
 
 COPY rootfs /
 RUN /opt/bitnami/scripts/locales/add-extra-locales.sh
-RUN /opt/bitnami/scripts/php/postunpack.sh
 RUN /opt/bitnami/scripts/apache/postunpack.sh
+RUN /opt/bitnami/scripts/php/postunpack.sh
 RUN /opt/bitnami/scripts/apache-modphp/postunpack.sh
 RUN /opt/bitnami/scripts/moodle/postunpack.sh
 RUN /opt/bitnami/scripts/mysql-client/postunpack.sh
@@ -41,7 +41,6 @@ ENV APACHE_HTTPS_PORT_NUMBER="" \
     APACHE_HTTP_PORT_NUMBER="" \
     APP_VERSION="3.11.6" \
     BITNAMI_APP_NAME="moodle" \
-    BITNAMI_IMAGE_VERSION="3.11.6-debian-10-r22" \
     LANG="en_US.UTF-8" \
     LANGUAGE="en_US:en" \
     PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/apache/bin:/opt/bitnami/postgresql/bin:/opt/bitnami/mysql/bin:/opt/bitnami/common/bin:$PATH"
diff --git a/bitnami/moodle/3/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/moodle/3/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
index 7a21a32e02ce..691dc2ec1282 100644
--- a/bitnami/moodle/3/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/moodle/3/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -43,10 +43,10 @@
     },
     "postgresql-client": {
         "arch": "amd64",
-        "digest": "10c4c8870775aa837cc37c243b20cde2efd166482aab0df90974c105884ea210",
+        "digest": "ef8f465e059e386aa96e44ba6787ed68ba4bd80c8e73681672b760c8d3114bff",
         "distro": "debian-10",
         "type": "NAMI",
-        "version": "13.6.0-4"
+        "version": "13.6.0-5"
     },
     "render-template": {
         "arch": "amd64",
diff --git a/bitnami/moodle/3/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh b/bitnami/moodle/3/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
index fee929c4ee1a..bd3d43db6e43 100644
--- a/bitnami/moodle/3/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
+++ b/bitnami/moodle/3/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
@@ -132,10 +132,14 @@ mysql_client_initialize() {
 #   None
 #########################
 mysql_client_wrap_binary_for_ssl() {
-    local -r wrapper_file="${DB_BIN_DIR}/mysql"
+    local wrapper_file="${DB_BIN_DIR}/mysql"
+    # In MySQL Client 10.6, mysql is a link to the mariadb binary
+    if [[ -f "${DB_BIN_DIR}/mariadb" ]]; then
+        wrapper_file="${DB_BIN_DIR}/mariadb"
+    fi
     local -r wrapped_binary_file="${DB_BASE_DIR}/.bin/mysql"
     local -a ssl_opts=()
-    read -r -a ssl_opts <<< "$(mysql_client_extra_opts)"
+    read -r -a ssl_opts <<<"$(mysql_client_extra_opts)"
 
     mv "$wrapper_file" "$wrapped_binary_file"
     cat >"$wrapper_file" <<EOF
diff --git a/bitnami/moodle/README.md b/bitnami/moodle/README.md
index 511cd805ca50..73c1cf4eb902 100644
--- a/bitnami/moodle/README.md
+++ b/bitnami/moodle/README.md
@@ -39,7 +39,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/).
 
 
-* [`3`, `3-debian-10`, `3.11.6`, `3.11.6-debian-10-r22`, `latest` (3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-moodle/blob/3.11.6-debian-10-r22/3/debian-10/Dockerfile)
+* [`3`, `3-debian-10`, `3.11.6`, `3.11.6-debian-10-r23`, `latest` (3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-moodle/blob/3.11.6-debian-10-r23/3/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/moodle GitHub repo](https://github.com/bitnami/bitnami-docker-moodle).