diff --git a/bitnami/wordpress/5/debian-10/Dockerfile b/bitnami/wordpress/5/debian-10/Dockerfile
index c87a18dba2b3..5c400cf87099 100644
--- a/bitnami/wordpress/5/debian-10/Dockerfile
+++ b/bitnami/wordpress/5/debian-10/Dockerfile
@@ -14,15 +14,15 @@ RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "apache" "2.4.48-
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "wp-cli" "2.5.0-0" --checksum b2be17e2065fc8d9d1a175e1dbc689e8f6a5543bb3b6a6f5470bc987b7c396ce
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "mysql-client" "10.3.31-0" --checksum 92b99c64a3ffe10fd94ef9ecd94d2dd65a172404c726093eb50b3b293523559d
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "libphp" "7.4.22-1" --checksum 02c944de0d39725adebf8a16960ceff5448f9d75d8ea8dc8228692baadee7659
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "wordpress" "5.8.0-4" --checksum f1a6e866c2046560072758d92dc104610b000b24a1472b31cdcd8f9234be04f4
+RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "wordpress" "5.8.0-5" --checksum 1f6f177bdba5f7bd309999e830177553afb886f1b8346681cf78ff4ac71a7e9e
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "render-template" "1.0.0-3" --checksum 8179ad1371c9a7d897fe3b1bf53bbe763f94edafef19acad2498dd48b3674efe
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-0" --checksum 3e6fc37ca073b10a73a804d39c2f0c028947a1a596382a4f8ebe43dfbaa3a25e
 RUN chmod g+rwX /opt/bitnami
 
 COPY rootfs /
 RUN /opt/bitnami/scripts/mysql-client/postunpack.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/wordpress/postunpack.sh
 ENV ALLOW_EMPTY_PASSWORD="no" \
@@ -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.0-debian-10-r15" \
+    BITNAMI_IMAGE_VERSION="5.8.0-debian-10-r16" \
     MARIADB_HOST="mariadb" \
     MARIADB_PORT_NUMBER="3306" \
     MARIADB_ROOT_PASSWORD="" \
diff --git a/bitnami/wordpress/5/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/wordpress/5/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
index 26b55a51f7b0..1808bd7ac982 100644
--- a/bitnami/wordpress/5/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/wordpress/5/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -43,10 +43,10 @@
     },
     "wordpress": {
         "arch": "amd64",
-        "digest": "f1a6e866c2046560072758d92dc104610b000b24a1472b31cdcd8f9234be04f4",
+        "digest": "1f6f177bdba5f7bd309999e830177553afb886f1b8346681cf78ff4ac71a7e9e",
         "distro": "debian-10",
         "type": "NAMI",
-        "version": "5.8.0-4"
+        "version": "5.8.0-5"
     },
     "wp-cli": {
         "arch": "amd64",
diff --git a/bitnami/wordpress/5/debian-10/prebuildfs/opt/bitnami/scripts/libfile.sh b/bitnami/wordpress/5/debian-10/prebuildfs/opt/bitnami/scripts/libfile.sh
index dd47f25e4e45..41ebaf7464f6 100644
--- a/bitnami/wordpress/5/debian-10/prebuildfs/opt/bitnami/scripts/libfile.sh
+++ b/bitnami/wordpress/5/debian-10/prebuildfs/opt/bitnami/scripts/libfile.sh
@@ -10,7 +10,7 @@
 # Functions
 
 ########################
-# Replace a regex in a file
+# Replace a regex-matching string in a file
 # Arguments:
 #   $1 - filename
 #   $2 - match regex
@@ -30,7 +30,7 @@ replace_in_file() {
     # We should avoid using 'sed in-place' substitutions
     # 1) They are not compatible with files mounted from ConfigMap(s)
     # 2) We found incompatibility issues with Debian10 and "in-place" substitutions
-    del=$'\001' # Use a non-printable character as a 'sed' delimiter to avoid issues
+    local -r del=$'\001' # Use a non-printable character as a 'sed' delimiter to avoid issues
     if [[ $posix_regex = true ]]; then
         result="$(sed -E "s${del}${match_regex}${del}${substitute_regex}${del}g" "$filename")"
     else
@@ -39,6 +39,26 @@ replace_in_file() {
     echo "$result" > "$filename"
 }
 
+########################
+# Replace a regex-matching multiline string in a file
+# Arguments:
+#   $1 - filename
+#   $2 - match regex
+#   $3 - substitute regex
+# Returns:
+#   None
+#########################
+replace_in_file_multiline() {
+    local filename="${1:?filename is required}"
+    local match_regex="${2:?match regex is required}"
+    local substitute_regex="${3:?substitute regex is required}"
+
+    local result
+    local -r del=$'\001' # Use a non-printable character as a 'sed' delimiter to avoid issues
+    result="$(perl -pe "BEGIN{undef $/;} s${del}${match_regex}${del}${substitute_regex}${del}sg" "$filename")"
+    echo "$result" > "$filename"
+}
+
 ########################
 # Remove a line in a file based on a regex
 # Arguments:
diff --git a/bitnami/wordpress/README.md b/bitnami/wordpress/README.md
index 176f0a57d9d9..016e333bada1 100644
--- a/bitnami/wordpress/README.md
+++ b/bitnami/wordpress/README.md
@@ -41,7 +41,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.0`, `5.8.0-debian-10-r15`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress/blob/5.8.0-debian-10-r15/5/debian-10/Dockerfile)
+- [`5`, `5-debian-10`, `5.8.0`, `5.8.0-debian-10-r16`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress/blob/5.8.0-debian-10-r16/5/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/wordpress GitHub repo](https://github.com/bitnami/bitnami-docker-wordpress).