diff --git a/bitnami/moodle/3/debian-10/Dockerfile b/bitnami/moodle/3/debian-10/Dockerfile
index c1ad00773ec1..deef8ecf700f 100644
--- a/bitnami/moodle/3/debian-10/Dockerfile
+++ b/bitnami/moodle/3/debian-10/Dockerfile
@@ -12,8 +12,8 @@ ARG WITH_ALL_LOCALES="no"
 COPY prebuildfs /
 # Install required system packages and dependencies
 RUN install_packages acl ca-certificates cron curl 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 locales procps tar zlib1g
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "php" "7.3.29-6" --checksum 7daac9464051ab7ae075ec20e0d24ee99e95e133d2bca9e3bf78c1e6a3994424
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "apache" "2.4.48-1" --checksum 0296bc7dd5f621eba6f948433a6c7fc04a45876f42f6395cea5888b707f1ad11
+RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "php" "7.3.29-7" --checksum 1cfce7ca7b3afaf0e55736dedc0bb9cba8d2de16f760b26a2a7c3bce571ef81a
+RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "apache" "2.4.48-2" --checksum ce45103c76533b1fc3b07466dfb0c00aa9fa54b736dbd5e22160ef775233c880
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "mysql-client" "10.3.31-0" --checksum 92b99c64a3ffe10fd94ef9ecd94d2dd65a172404c726093eb50b3b293523559d
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "libphp" "7.3.29-1" --checksum bb5e5663ed26e35eac840f2f98d5beb0a458bad653dceb6efba0d8fd4918d673
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "render-template" "1.0.0-3" --checksum 8179ad1371c9a7d897fe3b1bf53bbe763f94edafef19acad2498dd48b3674efe
@@ -39,7 +39,7 @@ ENV ALLOW_EMPTY_PASSWORD="no" \
     APACHE_HTTPS_PORT_NUMBER="" \
     APACHE_HTTP_PORT_NUMBER="" \
     BITNAMI_APP_NAME="moodle" \
-    BITNAMI_IMAGE_VERSION="3.11.2-debian-10-r21" \
+    BITNAMI_IMAGE_VERSION="3.11.2-debian-10-r22" \
     LANG="en_US.UTF-8" \
     LANGUAGE="en_US:en" \
     MARIADB_HOST="mariadb" \
diff --git a/bitnami/moodle/3/debian-10/docker-compose.yml b/bitnami/moodle/3/debian-10/docker-compose.yml
index ecfabb217839..6dda6515a52f 100644
--- a/bitnami/moodle/3/debian-10/docker-compose.yml
+++ b/bitnami/moodle/3/debian-10/docker-compose.yml
@@ -3,6 +3,7 @@ services:
   mariadb:
     image: docker.io/bitnami/mariadb:10.5
     environment:
+      # ALLOW_EMPTY_PASSWORD is recommended only for development.
       - ALLOW_EMPTY_PASSWORD=yes
       - MARIADB_USER=bn_moodle
       - MARIADB_DATABASE=bitnami_moodle
@@ -20,6 +21,7 @@ services:
       - MOODLE_DATABASE_PORT_NUMBER=3306
       - MOODLE_DATABASE_USER=bn_moodle
       - MOODLE_DATABASE_NAME=bitnami_moodle
+      # ALLOW_EMPTY_PASSWORD is recommended only for development.
       - ALLOW_EMPTY_PASSWORD=yes
     volumes:
       - 'moodle_data:/bitnami/moodle'
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 d68b26f8314a..651924bd0dfb 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
@@ -1,10 +1,10 @@
 {
     "apache": {
         "arch": "amd64",
-        "digest": "0296bc7dd5f621eba6f948433a6c7fc04a45876f42f6395cea5888b707f1ad11",
+        "digest": "ce45103c76533b1fc3b07466dfb0c00aa9fa54b736dbd5e22160ef775233c880",
         "distro": "debian-10",
         "type": "NAMI",
-        "version": "2.4.48-1"
+        "version": "2.4.48-2"
     },
     "gosu": {
         "arch": "amd64",
@@ -36,10 +36,10 @@
     },
     "php": {
         "arch": "amd64",
-        "digest": "7daac9464051ab7ae075ec20e0d24ee99e95e133d2bca9e3bf78c1e6a3994424",
+        "digest": "1cfce7ca7b3afaf0e55736dedc0bb9cba8d2de16f760b26a2a7c3bce571ef81a",
         "distro": "debian-10",
         "type": "NAMI",
-        "version": "7.3.29-6"
+        "version": "7.3.29-7"
     },
     "render-template": {
         "arch": "amd64",
diff --git a/bitnami/moodle/README.md b/bitnami/moodle/README.md
index d91d9e24a15e..994d4dc8fc01 100644
--- a/bitnami/moodle/README.md
+++ b/bitnami/moodle/README.md
@@ -15,7 +15,7 @@ $ curl -sSL https://raw.githubusercontent.com/bitnami/bitnami-docker-moodle/mast
 $ docker-compose up -d
 ```
 
-You can find the default credentials and available configuration options in the [Environment Variables](#environment-variables) section.
+**Warning**: This quick setup is only intended for development environments. You are encouraged to change the insecure default credentials and check out the available configuration options in the [Environment Variables](#environment-variables) section for a more secure deployment.
 
 ## Why use Bitnami Images?
 
@@ -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.2`, `3.11.2-debian-10-r21`, `latest` (3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-moodle/blob/3.11.2-debian-10-r21/3/debian-10/Dockerfile)
+* [`3`, `3-debian-10`, `3.11.2`, `3.11.2-debian-10-r22`, `latest` (3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-moodle/blob/3.11.2-debian-10-r22/3/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/moodle GitHub repo](https://github.com/bitnami/bitnami-docker-moodle).
 
diff --git a/bitnami/moodle/docker-compose.yml b/bitnami/moodle/docker-compose.yml
index ecfabb217839..6dda6515a52f 100644
--- a/bitnami/moodle/docker-compose.yml
+++ b/bitnami/moodle/docker-compose.yml
@@ -3,6 +3,7 @@ services:
   mariadb:
     image: docker.io/bitnami/mariadb:10.5
     environment:
+      # ALLOW_EMPTY_PASSWORD is recommended only for development.
       - ALLOW_EMPTY_PASSWORD=yes
       - MARIADB_USER=bn_moodle
       - MARIADB_DATABASE=bitnami_moodle
@@ -20,6 +21,7 @@ services:
       - MOODLE_DATABASE_PORT_NUMBER=3306
       - MOODLE_DATABASE_USER=bn_moodle
       - MOODLE_DATABASE_NAME=bitnami_moodle
+      # ALLOW_EMPTY_PASSWORD is recommended only for development.
       - ALLOW_EMPTY_PASSWORD=yes
     volumes:
       - 'moodle_data:/bitnami/moodle'