diff --git a/bitnami/moodle/4/debian-11/Dockerfile b/bitnami/moodle/4/debian-11/Dockerfile
index 5da5a40b875d..b332b4ae6119 100644
--- a/bitnami/moodle/4/debian-11/Dockerfile
+++ b/bitnami/moodle/4/debian-11/Dockerfile
@@ -4,11 +4,11 @@ ARG EXTRA_LOCALES
 ARG TARGETARCH
 ARG WITH_ALL_LOCALES="no"
 
-LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
-      org.opencontainers.image.description="Application packaged by Bitnami" \
+LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
+      org.opencontainers.image.created="2023-02-17T15:37:31Z" \
+      org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="4.1.1-debian-11-r11" \
-      org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/moodle" \
+      org.opencontainers.image.ref.name="4.1.1-debian-11-r12" \
       org.opencontainers.image.title="moodle" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="4.1.1"
@@ -24,14 +24,14 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN install_packages acl ca-certificates cron curl libaudit1 libbrotli1 libbsd0 libbz2-1.0 libcap-ng0 libcom-err2 libcrypt1 libcurl4 libedit2 libexpat1 libffi7 libfftw3-double3 libfontconfig1 libfreetype6 libgcc-s1 libgcrypt20 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed6 libicu67 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 libmd0 libmemcached11 libncurses6 libnettle8 libnghttp2-14 libonig5 libp11-kit0 libpam0g libpcre2-8-0 libpcre3 libpng16-16 libpq5 libpsl5 libreadline8 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 zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
-      "php-8.0.28-0-linux-${OS_ARCH}-debian-11" \
-      "apache-2.4.55-4-linux-${OS_ARCH}-debian-11" \
-      "postgresql-client-13.10.0-0-linux-${OS_ARCH}-debian-11" \
-      "mysql-client-10.6.12-0-linux-${OS_ARCH}-debian-11" \
-      "libphp-8.0.28-0-linux-${OS_ARCH}-debian-11" \
-      "render-template-1.0.5-0-linux-${OS_ARCH}-debian-11" \
-      "moodle-4.1.1-1-linux-${OS_ARCH}-debian-11" \
-      "gosu-1.16.0-1-linux-${OS_ARCH}-debian-11" \
+      "php-8.0.28-1-linux-${OS_ARCH}-debian-11" \
+      "apache-2.4.55-5-linux-${OS_ARCH}-debian-11" \
+      "postgresql-client-13.10.0-1-linux-${OS_ARCH}-debian-11" \
+      "mysql-client-10.6.12-1-linux-${OS_ARCH}-debian-11" \
+      "libphp-8.0.28-1-linux-${OS_ARCH}-debian-11" \
+      "render-template-1.0.5-1-linux-${OS_ARCH}-debian-11" \
+      "moodle-4.1.1-2-linux-${OS_ARCH}-debian-11" \
+      "gosu-1.16.0-2-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
diff --git a/bitnami/moodle/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/moodle/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 756d5697bd57..8cabbc7a0377 100644
--- a/bitnami/moodle/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/moodle/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -1,58 +1,58 @@
 {
     "apache": {
         "arch": "amd64",
-        "digest": "6937b37eaae1a0053c097ae04509cf3ccc4d260dd5fe010572753c3e8b22470d",
+        "digest": "a1afe61b7489ffb908895a02d0ce3b8771005a61489c35bef21101bb87b00a9d",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "2.4.55-4"
+        "version": "2.4.55-5"
     },
     "gosu": {
         "arch": "amd64",
-        "digest": "9ab9654690d90d3c49ff66fb1eb286487e318adc899d036bc45922f6b176865b",
+        "digest": "f6056076afb745fd7d9d87d20f71e7248d63330352cf5ae0be2130b7f44a8cfa",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "1.16.0-1"
+        "version": "1.16.0-2"
     },
     "libphp": {
         "arch": "amd64",
-        "digest": "b60db2a11e595d8fb25367c818760d5acb0e9d6967259eeece4ea3cc20be858f",
+        "digest": "d5aa0be40a79bb9f71d030c5d27636433f141bb6d7c237eafdffb2f01fcf17b7",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "8.0.28-0"
+        "version": "8.0.28-1"
     },
     "moodle": {
         "arch": "amd64",
-        "digest": "fadc8c935341bdb1a5e25131f14c8abfe64603acc2d6ff2105159791473def45",
+        "digest": "d666c054a748aa4018ee04cdc7eb793575467b73ce38b7dfbaaa51ea358ea4d4",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "4.1.1-1"
+        "version": "4.1.1-2"
     },
     "mysql-client": {
         "arch": "amd64",
-        "digest": "f1d55c82fe67003513561ab0b4c91f2e7699d4eaaa5d417dc4ed6be50cb4cbed",
+        "digest": "dbc087bd90a6387956751464da45660229b3e7349b96099805e61dcbc2514853",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "10.6.12-0"
+        "version": "10.6.12-1"
     },
     "php": {
         "arch": "amd64",
-        "digest": "b368582efa2bad583abf7f8dfa85b840f41635a283fffb116a60d74743039387",
+        "digest": "7e8454fc4ee35df73f26bf09c9b5fe4dd130202dda3de42341facd900068a971",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "8.0.28-0"
+        "version": "8.0.28-1"
     },
     "postgresql-client": {
         "arch": "amd64",
-        "digest": "512e881136125fb2cb046767cdaf36783853d4b84e15c57dbd18d7b2177d3f7a",
+        "digest": "2b34f81adcd687ccfe59415c378605ea9bce9a4200cd2e10599f187fbcecc249",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "13.10.0-0"
+        "version": "13.10.0-1"
     },
     "render-template": {
         "arch": "amd64",
-        "digest": "57c1d857acbb187fcb98f4ba26d138af9d866f59ad38dd443a75c0a6422de994",
+        "digest": "185e277977366ec222d2bde1a395ffa138ce1a9d3bdf1df20c3e49e8b8f9c68b",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "1.0.5-0"
+        "version": "1.0.5-1"
     }
 }
\ No newline at end of file
diff --git a/bitnami/moodle/README.md b/bitnami/moodle/README.md
index 17f99b669151..e4c3cc5d75b9 100644
--- a/bitnami/moodle/README.md
+++ b/bitnami/moodle/README.md
@@ -88,7 +88,7 @@ docker network create moodle-network
 #### Step 2: Create a volume for MariaDB persistence and create a MariaDB container
 
 ```console
-docker volume create --name mariadb_data
+$ docker volume create --name mariadb_data
 docker run -d --name mariadb \
   --env ALLOW_EMPTY_PASSWORD=yes \
   --env MARIADB_USER=bn_moodle \
@@ -102,7 +102,7 @@ docker run -d --name mariadb \
 #### Step 3: Create volumes for Moodle™ persistence and launch the container
 
 ```console
-docker volume create --name moodle_data
+$ docker volume create --name moodle_data
 docker run -d --name moodle \
   -p 8080:8080 -p 8443:8443 \
   --env ALLOW_EMPTY_PASSWORD=yes \
@@ -187,7 +187,7 @@ docker run -d --name moodle \
 
 ## Configuration
 
-## Environment variables
+### Environment variables
 
 When you start the Moodle™ image, you can adjust the configuration of the instance by passing one or more environment variables either on the docker-compose file or on the `docker run` command line. If you want to add a new environment variable:
 
@@ -213,7 +213,7 @@ moodle:
 
 Available environment variables:
 
-### User and Site configuration
+#### User and Site configuration
 
 * `MOODLE_USERNAME`: Moodle application username. Default: **user**
 * `MOODLE_PASSWORD`: Moodle application password. Default: **bitnami**
@@ -225,7 +225,7 @@ Available environment variables:
 * `MOODLE_SSLPROXY`: Allows you to activate the sslproxy feature of Moodle. Default: **no**
 * `MOODLE_LANG`: Allows you to set the default site language. Default: **en**
 
-### Use an existing database
+#### Use an existing database
 
 * `MOODLE_DATABASE_TYPE`: Database type. Valid values: *mariadb*, *mysqli*, *pgsql*, *auroramysql*. Default: **mariadb**
 * `MOODLE_DATABASE_HOST`: Hostname for database server. Default: **mariadb**
@@ -235,7 +235,7 @@ Available environment variables:
 * `MOODLE_DATABASE_PASSWORD`: Database password that Moodle will use to connect with the database. No defaults.
 * `ALLOW_EMPTY_PASSWORD`: It can be used to allow blank passwords. Default: **no**
 
-### Create a database for Moodle using mysql-client
+#### Create a database for Moodle 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**
@@ -255,7 +255,7 @@ Available environment variables:
 * `MYSQL_CLIENT_SSL_KEY_FILE`: Path to the SSL CA file for the new database. No defaults
 * `ALLOW_EMPTY_PASSWORD`: It can be used to allow blank passwords. Default: **no**
 
-### Create a database for Moodle using postgresql-client
+#### Create a database for Moodle using postgresql-client
 
 * `POSTGRESQL_CLIENT_DATABASE_HOST`: Hostname for the PostgreSQL server. Default: **postgresql**
 * `POSTGRESQL_CLIENT_DATABASE_PORT_NUMBER`: Port used by the PostgreSQL server. Default: **5432**
@@ -268,7 +268,7 @@ Available environment variables:
 * `POSTGRESQL_CLIENT_EXECUTE_SQL`: SQL code to execute in the PostgreSQL server. No defaults.
 * `ALLOW_EMPTY_PASSWORD`: It can be used to allow blank passwords. Default: **no**
 
-### SMTP Configuration
+#### SMTP Configuration
 
 To configure Moodle™ to send email using SMTP you can set the following environment variables:
 
@@ -278,7 +278,7 @@ To configure Moodle™ to send email using SMTP you can set the following en
 * `MOODLE_SMTP_PASSWORD`: SMTP account password.
 * `MOODLE_SMTP_PROTOCOL`: SMTP protocol.
 
-### PHP configuration
+#### PHP configuration
 
 * `PHP_ENABLE_OPCACHE`: Enable OPcache for PHP scripts. No default.
 * `PHP_EXPOSE_PHP`: Enables HTTP header with PHP version. No default.
@@ -289,7 +289,7 @@ To configure Moodle™ to send email using SMTP you can set the following en
 * `PHP_POST_MAX_SIZE`: Maximum size for PHP POST requests. No default.
 * `PHP_UPLOAD_MAX_FILESIZE`: Maximum file size for PHP uploads. No default.
 
-### Examples
+#### Examples
 
 This would be an example of SMTP configuration using a Gmail account:
 
@@ -477,7 +477,7 @@ Restoring a backup is as simple as mounting the backup as volumes in the contain
 For the MariaDB database container:
 
 ```diff
- docker run -d --name mariadb \
+ $ docker run -d --name mariadb \
    ...
 -  --volume /path/to/mariadb-persistence:/bitnami/mariadb \
 +  --volume /path/to/mariadb-backups/latest:/bitnami/mariadb \
@@ -487,7 +487,7 @@ For the MariaDB database container:
 For the Moodle™ container:
 
 ```diff
- docker run -d --name moodle \
+ $ docker run -d --name moodle \
    ...
 -  --volume /path/to/moodle-persistence:/bitnami/moodle \
 +  --volume /path/to/moodle-backups/latest:/bitnami/moodle \