diff --git a/bitnami/wordpress-intel/6/debian-11/Dockerfile b/bitnami/wordpress-intel/6/debian-11/Dockerfile
index 50314c705fd1..b2a05de36ce3 100644
--- a/bitnami/wordpress-intel/6/debian-11/Dockerfile
+++ b/bitnami/wordpress-intel/6/debian-11/Dockerfile
@@ -14,7 +14,7 @@ RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "php" "8.0.21-1"
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "wp-cli" "2.6.0-151" --checksum b426a51a33d93a22917e843161af356f733e806293bab5b93ddacf9b4041a5b7
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "nginx-intel" "0.4.7-151" --checksum 8c9eeeda17b37a7fcd97a63d96d2c4f8193612e930a318de678d3d2a1bd57ff8
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "mysql-client" "10.6.8-150" --checksum b47e1015fc1c9ce456f134ffd5b6ac6960c3f369c96fcd37319e9289b29a1047
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "wordpress" "6.0.0-158" --checksum 0ea42f4c7e91b50d3809fec737b7abc9fb6e463b68a7069c456ddd79a851aac6
+RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "wordpress" "6.0.0-159" --checksum 4cbcdc903c936cdef62d204166fa6a6653a961520c4f4e6b5200f101a6b63d86
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-151" --checksum 089bb11a3bc6031c5a91ab5f9534e9e7e41b928d10d72a3986f16bb61d3a9900
 RUN apt-get update && apt-get upgrade -y && \
     rm -r /var/lib/apt/lists /var/cache/apt/archives
diff --git a/bitnami/wordpress-intel/6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/wordpress-intel/6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 0cb8aca46261..64afc17a3721 100644
--- a/bitnami/wordpress-intel/6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/wordpress-intel/6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -43,10 +43,10 @@
     },
     "wordpress": {
         "arch": "amd64",
-        "digest": "0ea42f4c7e91b50d3809fec737b7abc9fb6e463b68a7069c456ddd79a851aac6",
+        "digest": "4cbcdc903c936cdef62d204166fa6a6653a961520c4f4e6b5200f101a6b63d86",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "6.0.0-158"
+        "version": "6.0.0-159"
     },
     "wp-cli": {
         "arch": "amd64",
diff --git a/bitnami/wordpress-intel/6/debian-11/rootfs/opt/bitnami/scripts/libwordpress.sh b/bitnami/wordpress-intel/6/debian-11/rootfs/opt/bitnami/scripts/libwordpress.sh
index 30e65d56d14c..39805898235a 100644
--- a/bitnami/wordpress-intel/6/debian-11/rootfs/opt/bitnami/scripts/libwordpress.sh
+++ b/bitnami/wordpress-intel/6/debian-11/rootfs/opt/bitnami/scripts/libwordpress.sh
@@ -89,6 +89,7 @@ wordpress_validate() {
     check_yes_no_value "WORDPRESS_RESET_DATA_PERMISSIONS"
     check_yes_no_value "WORDPRESS_SKIP_BOOTSTRAP"
     check_multi_value "WORDPRESS_AUTO_UPDATE_LEVEL" "major minor none"
+    check_yes_no_value "WORDPRESS_ENABLE_REVERSE_PROXY"
 
     # Multisite validations
     check_yes_no_value "WORDPRESS_ENABLE_MULTISITE"
@@ -243,6 +244,7 @@ wordpress_initialize() {
         if is_file_writable "$WORDPRESS_CONF_FILE"; then
             # Set miscellaneous configurations
             wordpress_conf_set "FS_METHOD" "direct"
+            is_boolean_yes "$WORDPRESS_ENABLE_REVERSE_PROXY" && wordpress_configure_reverse_proxy
             ! is_boolean_yes "$WORDPRESS_ENABLE_MULTISITE" && wordpress_configure_urls
             # The only variable/non-constant in the entire configuration file is '$table_prefix'
             replace_in_file "$WORDPRESS_CONF_FILE" "^(\s*\\\$table_prefix\s*=\s*).*" "\1'$WORDPRESS_TABLE_PREFIX';"
@@ -606,6 +608,33 @@ if ( !defined( 'WP_CLI' ) ) {
 EOF
 }
 
+########################
+# Configure reverse proxy headers
+# Globals:
+#   *
+# Arguments:
+#   None
+# Returns:
+#   None
+#########################
+wordpress_configure_reverse_proxy() {
+    wordpress_conf_append "$(
+        cat <<"EOF"
+/**
+ * Handle potential reverse proxy headers. Ref:
+ *  - https://wordpress.org/support/article/faq-installation/#how-can-i-get-wordpress-working-when-im-behind-a-reverse-proxy
+ *  - https://wordpress.org/support/article/administration-over-ssl/#using-a-reverse-proxy
+ */
+if ( ! empty( $_SERVER['HTTP_X_FORWARDED_HOST'] ) ) {
+	$_SERVER['HTTP_HOST'] = $_SERVER['HTTP_X_FORWARDED_HOST'];
+}
+if ( ! empty( $_SERVER['HTTP_X_FORWARDED_PROTO'] ) \&\& 'https' === $_SERVER['HTTP_X_FORWARDED_PROTO'] ) {
+	$_SERVER['HTTPS'] = 'on';
+}
+EOF
+    )"
+}
+
 ########################
 # Configure application URLs for WordPress (non-Multisite)
 # Globals:
diff --git a/bitnami/wordpress-intel/6/debian-11/rootfs/opt/bitnami/scripts/wordpress-env.sh b/bitnami/wordpress-intel/6/debian-11/rootfs/opt/bitnami/scripts/wordpress-env.sh
index bcb3c9575b3e..f3d133d0ce1c 100644
--- a/bitnami/wordpress-intel/6/debian-11/rootfs/opt/bitnami/scripts/wordpress-env.sh
+++ b/bitnami/wordpress-intel/6/debian-11/rootfs/opt/bitnami/scripts/wordpress-env.sh
@@ -44,6 +44,7 @@ wordpress_env_vars=(
     WORDPRESS_SECURE_AUTH_SALT
     WORDPRESS_LOGGED_IN_SALT
     WORDPRESS_NONCE_SALT
+    WORDPRESS_ENABLE_REVERSE_PROXY
     WORDPRESS_USERNAME
     WORDPRESS_PASSWORD
     WORDPRESS_EMAIL
@@ -135,6 +136,7 @@ export WORDPRESS_AUTH_SALT="${WORDPRESS_AUTH_SALT:-}"
 export WORDPRESS_SECURE_AUTH_SALT="${WORDPRESS_SECURE_AUTH_SALT:-}"
 export WORDPRESS_LOGGED_IN_SALT="${WORDPRESS_LOGGED_IN_SALT:-}"
 export WORDPRESS_NONCE_SALT="${WORDPRESS_NONCE_SALT:-}"
+export WORDPRESS_ENABLE_REVERSE_PROXY="${WORDPRESS_ENABLE_REVERSE_PROXY:-no}" # only used during the first initialization
 
 # WordPress credentials
 export WORDPRESS_USERNAME="${WORDPRESS_USERNAME:-user}" # only used during the first initialization
diff --git a/bitnami/wordpress-intel/README.md b/bitnami/wordpress-intel/README.md
index 5f1cf5c5c845..d08039cb9242 100644
--- a/bitnami/wordpress-intel/README.md
+++ b/bitnami/wordpress-intel/README.md
@@ -49,7 +49,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/).
 
 
-- [`6`, `6-debian-11`, `6.0.0`, `6.0.0-debian-11-r11`, `latest` (6/debian-11/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress/blob/6.0.0-debian-11-r11/6/debian-11/Dockerfile)
+- [`6`, `6-debian-11`, `6.0.0`, `6.0.0-debian-11-r12`, `latest` (6/debian-11/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress/blob/6.0.0-debian-11-r12/6/debian-11/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/wordpress GitHub repo](https://github.com/bitnami/bitnami-docker-wordpress).
 
@@ -250,6 +250,7 @@ Available environment variables:
 - `WORDPRESS_ENABLE_HTTPS`: Whether to use HTTPS by default. Default: **no**
 - `WORDPRESS_SKIP_BOOTSTRAP`: Skip the WordPress for Intel installation wizard. This is necessary when providing a database with existing WordPress for Intel data. Default: **no**
 - `WORDPRESS_AUTO_UPDATE_LEVEL`: Level of auto-updates to allow for the WordPress for Intel core installation. Valid values: `major`, `minor`, `none`. Default: **none**
+- `WORDPRESS_ENABLE_REVERSE_PROXY`: Enable WordPress support for reverse proxy headers. Default: **no**
 
 ##### Multisite configuration