diff --git a/bitnami/moodle/3/debian-10/Dockerfile b/bitnami/moodle/3/debian-10/Dockerfile
index 09708e7e0128..c4e65a7cd6e1 100644
--- a/bitnami/moodle/3/debian-10/Dockerfile
+++ b/bitnami/moodle/3/debian-10/Dockerfile
@@ -29,8 +29,8 @@ 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/php/postunpack.sh
 RUN /opt/bitnami/scripts/apache/postunpack.sh
+RUN /opt/bitnami/scripts/php/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
@@ -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.4-debian-10-r6" \
+    BITNAMI_IMAGE_VERSION="3.11.4-debian-10-r7" \
     LANG="en_US.UTF-8" \
     LANGUAGE="en_US:en" \
     MARIADB_HOST="mariadb" \
diff --git a/bitnami/moodle/3/debian-10/rootfs/opt/bitnami/scripts/libapache.sh b/bitnami/moodle/3/debian-10/rootfs/opt/bitnami/scripts/libapache.sh
index 99c18af35cd6..bf287455b46c 100644
--- a/bitnami/moodle/3/debian-10/rootfs/opt/bitnami/scripts/libapache.sh
+++ b/bitnami/moodle/3/debian-10/rootfs/opt/bitnami/scripts/libapache.sh
@@ -435,8 +435,8 @@ ensure_apache_app_configuration_exists() {
     fi
     # App .htaccess support (only when type is not defined)
     export htaccess_include
-    [[ -z "$type" ]] && is_boolean_yes "$move_htaccess" && apache_replace_htaccess_files "$app" --document-root "$document_root"
-    if [[ -z "$type" && -f "${APACHE_HTACCESS_DIR}/${app}-htaccess.conf" ]]; then
+    [[ -z "$type" || "$type" = "php" ]] && is_boolean_yes "$move_htaccess" && apache_replace_htaccess_files "$app" --document-root "$document_root"
+    if [[ -z "$type" || "$type" = "php" ]] && [[ -f "${APACHE_HTACCESS_DIR}/${app}-htaccess.conf" ]]; then
         allow_override="None"
         htaccess_include="Include \"${APACHE_HTACCESS_DIR}/${app}-htaccess.conf\""
     else
@@ -575,8 +575,8 @@ ensure_apache_prefix_configuration_exists() {
     done
     # App .htaccess support (only when type is not defined)
     export htaccess_include
-    [[ -z "$type" ]] && is_boolean_yes "$move_htaccess" && apache_replace_htaccess_files "$app" --document-root "$document_root"
-    if [[ -z "$type" && -f "${APACHE_HTACCESS_DIR}/${app}-htaccess.conf" ]]; then
+    [[ -z "$type" || "$type" = "php" ]] && is_boolean_yes "$move_htaccess" && apache_replace_htaccess_files "$app" --document-root "$document_root"
+    if [[ -z "$type" || "$type" = "php" ]] && [[ -f "${APACHE_HTACCESS_DIR}/${app}-htaccess.conf" ]]; then
         allow_override="None"
         htaccess_include="Include \"${APACHE_HTACCESS_DIR}/${app}-htaccess.conf\""
     else
diff --git a/bitnami/moodle/README.md b/bitnami/moodle/README.md
index 4e11454b1bb2..43c54718fb93 100644
--- a/bitnami/moodle/README.md
+++ b/bitnami/moodle/README.md
@@ -6,6 +6,8 @@
 
 [Overview of Bitnami LMS powered by Moodle(TM) LMS](http://moodle.org/)
 
+Disclaimer: The respective trademarks mentioned in the offering are owned by the respective companies. We do not provide commercial license of any of these products. This listing has an open source license. Moodle(TM) LMS is run and maintained by Moodle HQ, that is a completely and separate project from Bitnami.
+
 ## TL;DR
 
 ```console
@@ -37,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.4`, `3.11.4-debian-10-r6`, `latest` (3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-moodle/blob/3.11.4-debian-10-r6/3/debian-10/Dockerfile)
+* [`3`, `3-debian-10`, `3.11.4`, `3.11.4-debian-10-r7`, `latest` (3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-moodle/blob/3.11.4-debian-10-r7/3/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/moodle GitHub repo](https://github.com/bitnami/bitnami-docker-moodle).