diff --git a/bitnami/moodle/5.1/debian-12/Dockerfile b/bitnami/moodle/5.1/debian-12/Dockerfile
index 56494a2e096d..e829cc94fd5f 100644
--- a/bitnami/moodle/5.1/debian-12/Dockerfile
+++ b/bitnami/moodle/5.1/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="2025-10-11T12:29:47Z" \
+      org.opencontainers.image.created="2025-10-14T07:27:52Z" \
       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" \
@@ -29,8 +29,8 @@ RUN --mount=type=secret,id=downloads_url,env=SECRET_DOWNLOADS_URL \
     DOWNLOADS_URL=${SECRET_DOWNLOADS_URL:-${DOWNLOADS_URL}} ; \
     mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \
     COMPONENTS=( \
-      "render-template-1.0.9-157-linux-${OS_ARCH}-debian-12" \
-      "php-8.2.29-15-linux-${OS_ARCH}-debian-12" \
+      "render-template-1.0.9-158-linux-${OS_ARCH}-debian-12" \
+      "php-8.2.29-16-linux-${OS_ARCH}-debian-12" \
       "apache-2.4.65-1-linux-${OS_ARCH}-debian-12" \
       "postgresql-client-13.22.0-0-linux-${OS_ARCH}-debian-12" \
       "mysql-client-12.0.2-0-linux-${OS_ARCH}-debian-12" \
@@ -67,7 +67,7 @@ ENV APACHE_HTTPS_PORT_NUMBER="" \
     APACHE_HTTP_PORT_NUMBER="" \
     APP_VERSION="5.1.0" \
     BITNAMI_APP_NAME="moodle" \
-    IMAGE_REVISION="1" \
+    IMAGE_REVISION="2" \
     LANG="en_US.UTF-8" \
     LANGUAGE="en_US:en" \
     PATH="/opt/bitnami/common/bin:/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/apache/bin:/opt/bitnami/postgresql/bin:/opt/bitnami/mysql/bin:$PATH"
diff --git a/bitnami/moodle/5.1/debian-12/rootfs/opt/bitnami/scripts/moodle/postunpack.sh b/bitnami/moodle/5.1/debian-12/rootfs/opt/bitnami/scripts/moodle/postunpack.sh
index 2b23089df52c..23b37acb20fe 100755
--- a/bitnami/moodle/5.1/debian-12/rootfs/opt/bitnami/scripts/moodle/postunpack.sh
+++ b/bitnami/moodle/5.1/debian-12/rootfs/opt/bitnami/scripts/moodle/postunpack.sh
@@ -45,7 +45,12 @@ php_conf_set extension "pgsql"
 # Enable default web server configuration for Moodle
 info "Creating default web server configuration for Moodle"
 web_server_validate
-ensure_web_server_app_configuration_exists "moodle" --type php --apache-additional-configuration '
+root_dir="${MOODLE_BASE_DIR}"
+#  Moodle 5.1 introduces a new "/public" directory.
+if [[ -d "${MOODLE_BASE_DIR}/public" ]]; then
+    root_dir="${MOODLE_BASE_DIR}/public"
+fi
+ensure_web_server_app_configuration_exists "moodle" --type php --document-root "${root_dir}" --apache-additional-configuration '
 RewriteEngine On
 
 RewriteRule ^/phpmyadmin - [L,NC]