diff --git a/modules/distribution/product/src/main/resources/conf/key-mappings.json b/modules/distribution/product/src/main/resources/conf/key-mappings.json
index 55eea6e036..9260e79515 100644
--- a/modules/distribution/product/src/main/resources/conf/key-mappings.json
+++ b/modules/distribution/product/src/main/resources/conf/key-mappings.json
@@ -22,6 +22,7 @@
   "transport.binary.receiver.parameters.ciphers": "transport.binary.receiver.parameters.ciphers",
   "synapse_properties.synapse_commons_json_buildValidNCNames": "synapse_properties.'synapse.commons.json.buildValidNCNames'",
   "transport.http.socket_timeout": "passthru_http.'http.socket.timeout'",
+  "transport.http.block_service_list": "passthru_http.'http.block_service_list'",
   "transport.http.core_worker_pool_size": "passthru_http.worker_pool_size_core",
   "transport.http.max_worker_pool_size": "passthru_http.worker_pool_size_max",
   "transport.http.worker_pool_queue_length": "passthru_http.worker_pool_queue_length",
diff --git a/modules/distribution/product/src/main/resources/conf/templates/repository/conf/passthru-http.properties.j2 b/modules/distribution/product/src/main/resources/conf/templates/repository/conf/passthru-http.properties.j2
index 712cd815be..857b0513d7 100644
--- a/modules/distribution/product/src/main/resources/conf/templates/repository/conf/passthru-http.properties.j2
+++ b/modules/distribution/product/src/main/resources/conf/templates/repository/conf/passthru-http.properties.j2
@@ -21,4 +21,8 @@
 ## Pass-through HTTP transport specific tuning parameters
 {% for key,value in passthru_http.items() %}
 {{key}}={{value}}
-{% endfor %}
\ No newline at end of file
+{% endfor %}
+
+{% if transport.http.block_service_list is defined %}
+http.headers.preserve={% for property in transport.http.preserve_http_headers %}{{property}}{% if loop.index < transport.http.preserve_http_headers|length %},{% endif %}{% endfor %}
+{% endif %}
\ No newline at end of file