diff --git a/elastic/logs/templates/component/track-shared-logsdb-mode.json b/elastic/logs/templates/component/track-shared-logsdb-mode.json
index b0905d34a..7825cd088 100644
--- a/elastic/logs/templates/component/track-shared-logsdb-mode.json
+++ b/elastic/logs/templates/component/track-shared-logsdb-mode.json
@@ -19,6 +19,9 @@
             {% if use_doc_values_skipper | default(true) %}
             ,"mapping.use_doc_values_skipper": true
             {% endif %}
+            {# non-serverless-index-settings-marker-start #}{%- if build_flavor != "serverless" or serverless_operator == true -%}
+            ,"use_time_series_doc_values_format_large_binary_block_size": true
+            {%- endif -%}{# non-serverless-index-settings-marker-end #}
         }
         {% endif %}
       }
diff --git a/elastic/security/templates/component/track-shared-logsdb-mode.json b/elastic/security/templates/component/track-shared-logsdb-mode.json
index 1b590707f..3b321c341 100644
--- a/elastic/security/templates/component/track-shared-logsdb-mode.json
+++ b/elastic/security/templates/component/track-shared-logsdb-mode.json
@@ -16,6 +16,9 @@
             "sort.field": [ "host.id", "@timestamp" ],
             "sort.order": [ "asc", "desc" ],
             "sort.missing": ["_first", "_last"]
+            {# non-serverless-index-settings-marker-start #}{%- if build_flavor != "serverless" or serverless_operator == true -%}
+            ,"use_time_series_doc_values_format_large_binary_block_size": true
+            {%- endif -%}{# non-serverless-index-settings-marker-end #}
         }
         {% endif %}
       }