diff --git a/manifests/php.yml b/manifests/php.yml
index 81de35a47c3..f6476847e03 100644
--- a/manifests/php.yml
+++ b/manifests/php.yml
@@ -392,7 +392,7 @@ manifest:
   tests/appsec/test_service_activation_metric.py::TestServiceActivationRemoteConfigurationConfigMetric: missing_feature
   tests/appsec/test_shell_execution.py::Test_ShellExecution: v0.95.0
   tests/appsec/test_shell_execution.py::Test_ShellExecution::test_truncate_1st_argument: bug (APPSEC-55673)
-  tests/appsec/test_span_tags_headers.py: bug (APPSEC-61286)
+  tests/appsec/test_span_tags_headers.py: v1.17.0-dev
   tests/appsec/test_suspicious_attacker_blocking.py::Test_Suspicious_Attacker_Blocking: v1.13.0+4663b2fa7c20c6920f347d059b57dc2a419cb7f7
   tests/appsec/test_trace_tagging.py::Test_TraceTaggingRules: v1.12.0
   tests/appsec/test_trace_tagging.py::Test_TraceTaggingRulesRcCapability: v1.12.0
diff --git a/utils/build/docker/php/common/headers.php b/utils/build/docker/php/common/headers.php
index 11146bd8141..9ea0c951769 100644
--- a/utils/build/docker/php/common/headers.php
+++ b/utils/build/docker/php/common/headers.php
@@ -1,6 +1,5 @@
 <?php
 header("Content-Language: en-US");
-header("Content-Length: 16");
+header("Content-Length: 15");
 
 echo "Hello, headers!";
-?>
\ No newline at end of file
diff --git a/utils/build/docker/php/php-fpm/php-fpm.conf b/utils/build/docker/php/php-fpm/php-fpm.conf
index 47e2bffb185..b5163539de7 100644
--- a/utils/build/docker/php/php-fpm/php-fpm.conf
+++ b/utils/build/docker/php/php-fpm/php-fpm.conf
@@ -6,6 +6,10 @@
     SetEnvIfNoCase ^Authorization$ "(.+)" HTTP_AUTHORIZATION=$1
     </IfModule>
     <VirtualHost *:7777>
+        # Trust Content-Length header from PHP-FPM instead of converting to chunked encoding
+        # See: https://github.com/apache/httpd/blob/trunk/modules/proxy/mod_proxy_fcgi.c
+        # mod_proxy_fcgi strips Content-Length by default; this preserves it
+        SetEnv ap_trust_cgilike_cl 1
         RewriteEngine on
         ProxyErrorOverride on 404
         # Disable ProxyErrorOverride for endpoint_fallback.php to avoid duplicate traces