diff --git a/templates/td-agent.conf b/templates/td-agent.conf
index 5445cf392b3096c7e5800587604b2d906d135735..17a3851829e8227cc1c1681f038018552b3c1c75 100644
--- a/templates/td-agent.conf
+++ b/templates/td-agent.conf
@@ -201,6 +201,7 @@
     @type file
     path /var/log/td-agent/buffer/alerta.*.buffer
     flush_at_shutdown true
+    flush_thread_count 8
   </buffer>
   <format>
     @type json
@@ -264,6 +265,7 @@
     @type file
     path /var/log/td-agent/buffer/{{ appl.index }}.*.buffer
     flush_at_shutdown true
+    flush_thread_count 8
   </buffer>
 </match>
 {% endif %}
@@ -283,6 +285,7 @@
     @type file
     path /var/log/td-agent/buffer/ansible.*.buffer
     flush_at_shutdown true
+    flush_thread_count 8
   </buffer>
   request_timeout 15s
 </match>
@@ -300,6 +303,7 @@
     @type file
     path /var/log/td-agent/buffer/uptime.ping.*.buffer
     flush_at_shutdown true
+    flush_thread_count 8
   </buffer>
   request_timeout 15s
 </match>
@@ -317,6 +321,7 @@
     @type file
     path /var/log/td-agent/buffer/haproxy.*.buffer
     flush_at_shutdown true
+    flush_thread_count 8
   </buffer>
   request_timeout 15s
 </match>
@@ -335,6 +340,7 @@
     @type file
     path /var/log/td-agent/buffer/default.*.buffer
     flush_at_shutdown true
+    flush_thread_count 8
   </buffer>
   request_timeout 15s
 </match>
@@ -357,6 +363,7 @@
     @type file
     path /var/log/td-agent/buffer/forward.*.buffer
     flush_at_shutdown true
+    flush_thread_count 8
   </buffer>
 </match>
 {% endif %}