diff --git a/bitnami/wordpress/5/debian-10/Dockerfile b/bitnami/wordpress/5/debian-10/Dockerfile
index 2d43fa8f5e6a..8a893c90c733 100644
--- a/bitnami/wordpress/5/debian-10/Dockerfile
+++ b/bitnami/wordpress/5/debian-10/Dockerfile
@@ -30,7 +30,7 @@ ENV ALLOW_EMPTY_PASSWORD="no" \
     APACHE_HTTPS_PORT_NUMBER="" \
     APACHE_HTTP_PORT_NUMBER="" \
     BITNAMI_APP_NAME="wordpress" \
-    BITNAMI_IMAGE_VERSION="5.8.2-debian-10-r4" \
+    BITNAMI_IMAGE_VERSION="5.8.2-debian-10-r5" \
     MARIADB_HOST="mariadb" \
     MARIADB_PORT_NUMBER="3306" \
     MARIADB_ROOT_PASSWORD="" \
diff --git a/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/libapache.sh b/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/libapache.sh
index 99c18af35cd6..bf287455b46c 100644
--- a/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/libapache.sh
+++ b/bitnami/wordpress/5/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/wordpress/README.md b/bitnami/wordpress/README.md
index e781ff6f3644..ce2eb40fbf26 100644
--- a/bitnami/wordpress/README.md
+++ b/bitnami/wordpress/README.md
@@ -6,6 +6,8 @@
 
 [Overview of WordPress](http://www.wordpress.org)
 
+
+
 ## TL;DR
 
 ```console
@@ -41,7 +43,7 @@ Non-root container images add an extra layer of security and are generally recom
 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/).
 
 
-- [`5`, `5-debian-10`, `5.8.2`, `5.8.2-debian-10-r4`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress/blob/5.8.2-debian-10-r4/5/debian-10/Dockerfile)
+- [`5`, `5-debian-10`, `5.8.2`, `5.8.2-debian-10-r5`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress/blob/5.8.2-debian-10-r5/5/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/wordpress GitHub repo](https://github.com/bitnami/bitnami-docker-wordpress).