diff --git a/bitnami/moodle/3/debian-10/Dockerfile b/bitnami/moodle/3/debian-10/Dockerfile
index 96d1c0d0760e..9aa97b11be78 100644
--- a/bitnami/moodle/3/debian-10/Dockerfile
+++ b/bitnami/moodle/3/debian-10/Dockerfile
@@ -31,15 +31,15 @@ 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/apache/postunpack.sh
 RUN /opt/bitnami/scripts/php/postunpack.sh
+RUN /opt/bitnami/scripts/apache/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
 ENV APACHE_HTTPS_PORT_NUMBER="" \
     APACHE_HTTP_PORT_NUMBER="" \
     BITNAMI_APP_NAME="moodle" \
-    BITNAMI_IMAGE_VERSION="3.11.5-debian-10-r20" \
+    BITNAMI_IMAGE_VERSION="3.11.5-debian-10-r21" \
     LANG="en_US.UTF-8" \
     LANGUAGE="en_US:en" \
     PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/apache/bin:/opt/bitnami/mysql/bin:/opt/bitnami/common/bin:$PATH"
diff --git a/bitnami/moodle/README.md b/bitnami/moodle/README.md
index 0e61c60388cb..cb2bdd0e171a 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.5`, `3.11.5-debian-10-r20`, `latest` (3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-moodle/blob/3.11.5-debian-10-r20/3/debian-10/Dockerfile)
+* [`3`, `3-debian-10`, `3.11.5`, `3.11.5-debian-10-r21`, `latest` (3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-moodle/blob/3.11.5-debian-10-r21/3/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/moodle GitHub repo](https://github.com/bitnami/bitnami-docker-moodle).