diff --git a/bitnami/moodle/5.2/debian-12/Dockerfile b/bitnami/moodle/5.2/debian-12/Dockerfile
index 15b03c589bf7..eedd4532baae 100644
--- a/bitnami/moodle/5.2/debian-12/Dockerfile
+++ b/bitnami/moodle/5.2/debian-12/Dockerfile
@@ -9,7 +9,7 @@ ARG TARGETARCH
 ARG WITH_ALL_LOCALES="no"
 
 LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
-      org.opencontainers.image.created="2026-06-08T02:20:37Z" \
+      org.opencontainers.image.created="2026-06-09T14:13:04Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/moodle/README.md" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/moodle" \
@@ -30,11 +30,11 @@ RUN --mount=type=secret,id=downloads_url,env=SECRET_DOWNLOADS_URL \
     mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \
     COMPONENTS=( \
       "render-template-1.0.9-166-linux-${OS_ARCH}-debian-12" \
-      "php-8.4.21-5-linux-${OS_ARCH}-debian-12" \
-      "apache-2.4.67-1-linux-${OS_ARCH}-debian-12" \
+      "php-8.4.22-1-linux-${OS_ARCH}-debian-12" \
+      "apache-2.4.68-0-linux-${OS_ARCH}-debian-12" \
       "postgresql-client-14.23.0-0-linux-${OS_ARCH}-debian-12" \
       "mysql-client-12.3.2-0-linux-${OS_ARCH}-debian-12" \
-      "libphp-8.4.21-0-linux-${OS_ARCH}-debian-12" \
+      "libphp-8.4.22-1-linux-${OS_ARCH}-debian-12" \
       "moodle-5.2.1-0-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
@@ -67,7 +67,7 @@ ENV APACHE_HTTPS_PORT_NUMBER="" \
     APACHE_HTTP_PORT_NUMBER="" \
     APP_VERSION="5.2.1" \
     BITNAMI_APP_NAME="moodle" \
-    IMAGE_REVISION="0" \
+    IMAGE_REVISION="1" \
     LANG="en_US.UTF-8" \
     LANGUAGE="en_US:en" \
     LD_LIBRARY_PATH="/opt/bitnami/postgresql/lib" \
diff --git a/bitnami/moodle/5.2/debian-12/prebuildfs/opt/bitnami/checksums/apache-2.4.67-1-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/moodle/5.2/debian-12/prebuildfs/opt/bitnami/checksums/apache-2.4.67-1-linux-amd64-debian-12.tar.gz.sha256
deleted file mode 100644
index ffe4d71f0d07..000000000000
--- a/bitnami/moodle/5.2/debian-12/prebuildfs/opt/bitnami/checksums/apache-2.4.67-1-linux-amd64-debian-12.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-cc9ec4ed758ad8502b7057aa3527cc003261038cd75f0a5fa8aa885bfea46ff1  apache-2.4.67-1-linux-amd64-debian-12.tar.gz
diff --git a/bitnami/moodle/5.2/debian-12/prebuildfs/opt/bitnami/checksums/apache-2.4.67-1-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/moodle/5.2/debian-12/prebuildfs/opt/bitnami/checksums/apache-2.4.67-1-linux-arm64-debian-12.tar.gz.sha256
deleted file mode 100644
index 06e58dbe1e02..000000000000
--- a/bitnami/moodle/5.2/debian-12/prebuildfs/opt/bitnami/checksums/apache-2.4.67-1-linux-arm64-debian-12.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-01aa3fe1d54b7ecde2e19098de2fe93205c1c105ff31391f98f5afc3274aa99e  apache-2.4.67-1-linux-arm64-debian-12.tar.gz
diff --git a/bitnami/moodle/5.2/debian-12/prebuildfs/opt/bitnami/checksums/apache-2.4.68-0-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/moodle/5.2/debian-12/prebuildfs/opt/bitnami/checksums/apache-2.4.68-0-linux-amd64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..e81bfa8e0de3
--- /dev/null
+++ b/bitnami/moodle/5.2/debian-12/prebuildfs/opt/bitnami/checksums/apache-2.4.68-0-linux-amd64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+98a1e56f30bbbd9d51655a18f0854c7180ff0ad0ce8b44d2eaeefa12844f9f02  apache-2.4.68-0-linux-amd64-debian-12.tar.gz
diff --git a/bitnami/moodle/5.2/debian-12/prebuildfs/opt/bitnami/checksums/apache-2.4.68-0-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/moodle/5.2/debian-12/prebuildfs/opt/bitnami/checksums/apache-2.4.68-0-linux-arm64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..fb2364acd31a
--- /dev/null
+++ b/bitnami/moodle/5.2/debian-12/prebuildfs/opt/bitnami/checksums/apache-2.4.68-0-linux-arm64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+1ad93386933cac367d4f6380344996c1a774e817caa8463b298d102eef2bf243  apache-2.4.68-0-linux-arm64-debian-12.tar.gz
diff --git a/bitnami/moodle/5.2/debian-12/prebuildfs/opt/bitnami/checksums/libphp-8.4.21-0-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/moodle/5.2/debian-12/prebuildfs/opt/bitnami/checksums/libphp-8.4.21-0-linux-amd64-debian-12.tar.gz.sha256
deleted file mode 100644
index 9e20f02d08b0..000000000000
--- a/bitnami/moodle/5.2/debian-12/prebuildfs/opt/bitnami/checksums/libphp-8.4.21-0-linux-amd64-debian-12.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-1c0534f33b21dc6b1754967226d002345b0461f94601a55006b91441136c240f  libphp-8.4.21-0-linux-amd64-debian-12.tar.gz
diff --git a/bitnami/moodle/5.2/debian-12/prebuildfs/opt/bitnami/checksums/libphp-8.4.21-0-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/moodle/5.2/debian-12/prebuildfs/opt/bitnami/checksums/libphp-8.4.21-0-linux-arm64-debian-12.tar.gz.sha256
deleted file mode 100644
index 3645c6b66d95..000000000000
--- a/bitnami/moodle/5.2/debian-12/prebuildfs/opt/bitnami/checksums/libphp-8.4.21-0-linux-arm64-debian-12.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-949e96622f83b03c9abfdd23c4d45fefb96cbecde83a6315d8d556806a2d3e4a  libphp-8.4.21-0-linux-arm64-debian-12.tar.gz
diff --git a/bitnami/moodle/5.2/debian-12/prebuildfs/opt/bitnami/checksums/libphp-8.4.22-1-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/moodle/5.2/debian-12/prebuildfs/opt/bitnami/checksums/libphp-8.4.22-1-linux-amd64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..bbe36d2f78dd
--- /dev/null
+++ b/bitnami/moodle/5.2/debian-12/prebuildfs/opt/bitnami/checksums/libphp-8.4.22-1-linux-amd64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+a64a1cb062f7bdb9ea94bfd0f79d65685d98f22342b2ecfd0e231b183b605000  libphp-8.4.22-1-linux-amd64-debian-12.tar.gz
diff --git a/bitnami/moodle/5.2/debian-12/prebuildfs/opt/bitnami/checksums/libphp-8.4.22-1-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/moodle/5.2/debian-12/prebuildfs/opt/bitnami/checksums/libphp-8.4.22-1-linux-arm64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..e3ce1c15b2b9
--- /dev/null
+++ b/bitnami/moodle/5.2/debian-12/prebuildfs/opt/bitnami/checksums/libphp-8.4.22-1-linux-arm64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+e774c534daba5c95201b8e57a6e13e8750b02bafbc8bdfec3d7ef59b520e647a  libphp-8.4.22-1-linux-arm64-debian-12.tar.gz
diff --git a/bitnami/moodle/5.2/debian-12/prebuildfs/opt/bitnami/checksums/php-8.4.21-5-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/moodle/5.2/debian-12/prebuildfs/opt/bitnami/checksums/php-8.4.21-5-linux-amd64-debian-12.tar.gz.sha256
deleted file mode 100644
index e6b37c12a0ea..000000000000
--- a/bitnami/moodle/5.2/debian-12/prebuildfs/opt/bitnami/checksums/php-8.4.21-5-linux-amd64-debian-12.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-101267a9e206d18be90a2bd1fc383a168359c96e1db7f7383d31a7366f1137fd  php-8.4.21-5-linux-amd64-debian-12.tar.gz
diff --git a/bitnami/moodle/5.2/debian-12/prebuildfs/opt/bitnami/checksums/php-8.4.21-5-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/moodle/5.2/debian-12/prebuildfs/opt/bitnami/checksums/php-8.4.21-5-linux-arm64-debian-12.tar.gz.sha256
deleted file mode 100644
index f18b6e839e8d..000000000000
--- a/bitnami/moodle/5.2/debian-12/prebuildfs/opt/bitnami/checksums/php-8.4.21-5-linux-arm64-debian-12.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-73d961f31f79364d8c10385e3f2a918fc5b7e8bb4150cbdf11063a1ed60fde9a  php-8.4.21-5-linux-arm64-debian-12.tar.gz
diff --git a/bitnami/moodle/5.2/debian-12/prebuildfs/opt/bitnami/checksums/php-8.4.22-1-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/moodle/5.2/debian-12/prebuildfs/opt/bitnami/checksums/php-8.4.22-1-linux-amd64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..8826fc85a20d
--- /dev/null
+++ b/bitnami/moodle/5.2/debian-12/prebuildfs/opt/bitnami/checksums/php-8.4.22-1-linux-amd64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+fa6a2f744c04fd308f9ce78cae7dc097fd5de6896ab94144fce2d5bf1b33f2ac  php-8.4.22-1-linux-amd64-debian-12.tar.gz
diff --git a/bitnami/moodle/5.2/debian-12/prebuildfs/opt/bitnami/checksums/php-8.4.22-1-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/moodle/5.2/debian-12/prebuildfs/opt/bitnami/checksums/php-8.4.22-1-linux-arm64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..ee49932bb258
--- /dev/null
+++ b/bitnami/moodle/5.2/debian-12/prebuildfs/opt/bitnami/checksums/php-8.4.22-1-linux-arm64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+03d2ae1bb27a1385e619261fe7a757be2b4be99335aa0673c3907d668da09e67  php-8.4.22-1-linux-arm64-debian-12.tar.gz
diff --git a/bitnami/moodle/5.2/debian-12/rootfs/opt/bitnami/scripts/libmoodle.sh b/bitnami/moodle/5.2/debian-12/rootfs/opt/bitnami/scripts/libmoodle.sh
index e4fff8bf2872..66e2e7be78a2 100644
--- a/bitnami/moodle/5.2/debian-12/rootfs/opt/bitnami/scripts/libmoodle.sh
+++ b/bitnami/moodle/5.2/debian-12/rootfs/opt/bitnami/scripts/libmoodle.sh
@@ -78,6 +78,10 @@ moodle_validate() {
         is_empty_value "${MOODLE_DATABASE_PASSWORD}" && print_validation_error "The MOODLE_DATABASE_PASSWORD environment variable is empty or not set. Set the environment variable ALLOW_EMPTY_PASSWORD=yes to allow a blank password. This is only recommended for development environments."
     fi
 
+    if is_empty_value "$MOODLE_HOST"; then
+        warn "MOODLE_HOST is not set, wwwroot will be constructed based on HTTP_HOST header which opens up vulnerability to password-reset poisoning attacks. Do not leave this variable empty in production environments."
+    fi
+
     # Validate SMTP credentials
     if ! is_empty_value "$MOODLE_SMTP_HOST"; then
         for empty_env_var in "MOODLE_SMTP_USER" "MOODLE_SMTP_PASSWORD"; do
@@ -161,7 +165,7 @@ moodle_initialize() {
             [[ "$db_type" = "pgsql" ]] && db_remote_execute="postgresql_remote_execute"
             local -a db_execute_args=("$db_host" "$db_port" "$db_name" "$db_user" "$db_pass")
             # Configure no-reply e-mail address for SMTP
-	    echo "INSERT INTO ${mdl_prefix}config (name, value) VALUES ('noreplyaddress', '${MOODLE_EMAIL}')" | "$db_remote_execute" "${db_execute_args[@]}"
+            echo "INSERT INTO ${mdl_prefix}config (name, value) VALUES ('noreplyaddress', '${MOODLE_EMAIL}')" | "$db_remote_execute" "${db_execute_args[@]}"
             # Additional Bitnami customizations
             echo "UPDATE ${mdl_prefix}course SET summary='Moodle powered by Bitnami' WHERE id='1'" | "$db_remote_execute" "${db_execute_args[@]}"
             # SMTP configuration
@@ -183,10 +187,12 @@ EOF
             info "Running database upgrade"
             moodle_upgrade
         fi
-        # Change wwwroot configuration so the Moodle site can be accessible from anywhere
+        # Change wwwroot configuration
         moodle_configure_wwwroot
         # Turn on Moodle's reverseproxy (also sslproxy if using ssl) so we can use the reverse proxy
-        moodle_configure_reverseproxy
+        if is_boolean_yes "$MOODLE_REVERSEPROXY" || is_boolean_yes "$MOODLE_SSLPROXY"; then
+            moodle_configure_reverseproxy
+        fi
 
         info "Persisting Moodle installation"
         persist_app "$app_name" "$MOODLE_DATA_TO_PERSIST"
@@ -336,7 +342,7 @@ moodle_install() {
     if am_i_root; then
         debug_execute run_as_user "$WEB_SERVER_DAEMON_USER" "${moodle_install_args[@]}"
         # Remove write permissions for the web server to the config.php file
-        configure_permissions_ownership "$MOODLE_CONF_FILE" -f "644" -u "root" -g "$WEB_SERVER_DAEMON_GROUP"
+        configure_permissions_ownership "$MOODLE_CONF_FILE" -f "640" -u "root" -g "$WEB_SERVER_DAEMON_GROUP"
     else
         debug_execute "${moodle_install_args[@]}"
     fi
diff --git a/bitnami/moodle/5.2/debian-12/rootfs/opt/bitnami/scripts/moodle/setup.sh b/bitnami/moodle/5.2/debian-12/rootfs/opt/bitnami/scripts/moodle/setup.sh
index ebacb42dbb81..abbd7855cafa 100755
--- a/bitnami/moodle/5.2/debian-12/rootfs/opt/bitnami/scripts/moodle/setup.sh
+++ b/bitnami/moodle/5.2/debian-12/rootfs/opt/bitnami/scripts/moodle/setup.sh
@@ -42,7 +42,9 @@ fi
 moodle_validate
 
 # Update web server configuration with runtime environment (needs to happen before the initialization)
-web_server_update_app_configuration "moodle"
+web_server_update_app_configuration_flags=("moodle")
+! is_empty_value "$MOODLE_HOST" && web_server_update_app_configuration_flags+=("--server-name" "$MOODLE_HOST")
+web_server_update_app_configuration "${web_server_update_app_configuration_flags[@]}"
 
 # Ensure Moodle is initialized
 moodle_initialize