diff --git a/bitnami/drupal/9/debian-10/Dockerfile b/bitnami/drupal/9/debian-10/Dockerfile
index 25e381848970..30b2459bcf5a 100644
--- a/bitnami/drupal/9/debian-10/Dockerfile
+++ b/bitnami/drupal/9/debian-10/Dockerfile
@@ -19,8 +19,8 @@ RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "drupal" "9.2.8-0
 RUN chmod g+rwX /opt/bitnami
 
 COPY rootfs /
-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/drupal/postunpack.sh
 RUN /opt/bitnami/scripts/mysql-client/postunpack.sh
@@ -29,7 +29,7 @@ ENV ALLOW_EMPTY_PASSWORD="no" \
     APACHE_HTTPS_PORT_NUMBER="" \
     APACHE_HTTP_PORT_NUMBER="" \
     BITNAMI_APP_NAME="drupal" \
-    BITNAMI_IMAGE_VERSION="9.2.8-debian-10-r11" \
+    BITNAMI_IMAGE_VERSION="9.2.8-debian-10-r12" \
     MARIADB_HOST="mariadb" \
     MARIADB_PORT_NUMBER="3306" \
     MARIADB_ROOT_PASSWORD="" \
diff --git a/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/libapache.sh b/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/libapache.sh
index 99c18af35cd6..bf287455b46c 100644
--- a/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/libapache.sh
+++ b/bitnami/drupal/9/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/drupal/README.md b/bitnami/drupal/README.md
index caddb8f47173..36072162e64a 100644
--- a/bitnami/drupal/README.md
+++ b/bitnami/drupal/README.md
@@ -6,6 +6,8 @@
 
 [Overview of Drupal](http://drupal.org)
 
+Trademarks: This software listing is packaged by Bitnami. The respective trademarks mentioned in the offering are owned by the respective companies, and use of them does not imply any affiliation or endorsement.
+
 ## TL;DR
 
 ```console
@@ -41,7 +43,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/).
 
 
-* [`9`, `9-debian-10`, `9.2.8`, `9.2.8-debian-10-r11`, `latest` (9/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/9.2.8-debian-10-r11/9/debian-10/Dockerfile)
+* [`9`, `9-debian-10`, `9.2.8`, `9.2.8-debian-10-r12`, `latest` (9/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/9.2.8-debian-10-r12/9/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/drupal GitHub repo](https://github.com/bitnami/bitnami-docker-drupal).