diff --git a/templates/td-agent.conf b/templates/td-agent.conf
index ea81ca9274ca52c6f602b8ffae8842297f2c3e8f..8de47b014ef96b389e5c8ea499da9a8d44c26aad 100644
--- a/templates/td-agent.conf
+++ b/templates/td-agent.conf
@@ -292,6 +292,12 @@
 {% if appl.plugin|default('elasticsearch') == 'elasticsearch' %}
   reconnect_on_error true
 {% endif %}
+  <buffer>
+    @type file
+    path /var/log/td-agent/buffer/{{ appl.index }}.*.buffer
+    flush_at_shutdown true
+    flush_thread_count 8
+  </buffer>
 {% endif %}
 {% if elasticsearch_install|default('yes') and fluentd_openobserve_backend is defined %}
   </store>
@@ -307,16 +313,16 @@
     username {{ fluentd_openobserve_backend.username }}
     password {{ fluentd_openobserve_backend.password }}
   </auth>
-{% endif %}
-{% if elasticsearch_install|default('yes') and fluentd_openobserve_backend is defined %}
-  </store>
-{% endif %}
   <buffer>
     @type file
-    path /var/log/td-agent/buffer/{{ appl.index }}.*.buffer
+    path /var/log/td-agent/buffer/oo_{{ appl.index }}.*.buffer
     flush_at_shutdown true
     flush_thread_count 8
   </buffer>
+{% endif %}
+{% if elasticsearch_install|default('yes') and fluentd_openobserve_backend is defined %}
+  </store>
+{% endif %}
 </match>
 {% endif %}
 {% endfor %}
@@ -338,6 +344,13 @@
   index_name ansible
   type_name ansible
   reconnect_on_error true
+  <buffer>
+    @type file
+    path /var/log/td-agent/buffer/ansible.*.buffer
+    flush_at_shutdown true
+    flush_thread_count 8
+  </buffer>
+  request_timeout 15s
 {% endif %}
 {% if elasticsearch_install|default('yes') and fluentd_openobserve_backend is defined %}
   </store>
@@ -353,17 +366,16 @@
     username {{ fluentd_openobserve_backend.username }}
     password {{ fluentd_openobserve_backend.password }}
   </auth>
-{% endif %}
-{% if elasticsearch_install|default('yes') and fluentd_openobserve_backend is defined %}
-  </store>
-{% endif %}
   <buffer>
     @type file
-    path /var/log/td-agent/buffer/ansible.*.buffer
+    path /var/log/td-agent/buffer/oo_ansible.*.buffer
     flush_at_shutdown true
     flush_thread_count 8
   </buffer>
-  request_timeout 15s
+{% endif %}
+{% if elasticsearch_install|default('yes') and fluentd_openobserve_backend is defined %}
+  </store>
+{% endif %}
 </match>
 
 <match app.uptime.ping>
@@ -382,6 +394,13 @@
   index_name uptime
   type_name ping
   reconnect_on_error true
+  <buffer>
+    @type file
+    path /var/log/td-agent/buffer/uptime.ping.*.buffer
+    flush_at_shutdown true
+    flush_thread_count 8
+  </buffer>
+  request_timeout 15s
 {% endif %}
 {% if elasticsearch_install|default('yes') and fluentd_openobserve_backend is defined %}
   </store>
@@ -397,17 +416,16 @@
     username {{ fluentd_openobserve_backend.username }}
     password {{ fluentd_openobserve_backend.password }}
   </auth>
-{% endif %}
-{% if elasticsearch_install|default('yes') and fluentd_openobserve_backend is defined %}
-  </store>
-{% endif %}
   <buffer>
     @type file
-    path /var/log/td-agent/buffer/uptime.ping.*.buffer
+    path /var/log/td-agent/buffer/oo_uptime.ping.*.buffer
     flush_at_shutdown true
     flush_thread_count 8
   </buffer>
-  request_timeout 15s
+{% endif %}
+{% if elasticsearch_install|default('yes') and fluentd_openobserve_backend is defined %}
+  </store>
+{% endif %}
 </match>
 
 <match haproxy.*>
@@ -426,6 +444,13 @@
   index_name haproxy
   type_name haproxy
   reconnect_on_error true
+  <buffer>
+    @type file
+    path /var/log/td-agent/buffer/haproxy.*.buffer
+    flush_at_shutdown true
+    flush_thread_count 8
+  </buffer>
+  request_timeout 15s
 {% endif %}
 {% if elasticsearch_install|default('yes') and fluentd_openobserve_backend is defined %}
   </store>
@@ -441,17 +466,16 @@
     username {{ fluentd_openobserve_backend.username }}
     password {{ fluentd_openobserve_backend.password }}
   </auth>
-{% endif %}
-{% if elasticsearch_install|default('yes') and fluentd_openobserve_backend is defined %}
-  </store>
-{% endif %}
   <buffer>
     @type file
-    path /var/log/td-agent/buffer/haproxy.*.buffer
+    path /var/log/td-agent/buffer/oo_haproxy.*.buffer
     flush_at_shutdown true
     flush_thread_count 8
   </buffer>
-  request_timeout 15s
+{% endif %}
+{% if elasticsearch_install|default('yes') and fluentd_openobserve_backend is defined %}
+  </store>
+{% endif %}
 </match>
 
 <match *beat>
@@ -471,6 +495,13 @@
   include_tag_key true
   tag_key @log_name
   reconnect_on_error true
+  <buffer>
+    @type file
+    path /var/log/td-agent/buffer/beats.*.buffer
+    flush_at_shutdown true
+    flush_thread_count 8
+  </buffer>
+  request_timeout 15s
 {% endif %}
 {% if elasticsearch_install|default('yes') and fluentd_openobserve_backend is defined %}
   </store>
@@ -486,17 +517,16 @@
     username {{ fluentd_openobserve_backend.username }}
     password {{ fluentd_openobserve_backend.password }}
   </auth>
-{% endif %}
-{% if elasticsearch_install|default('yes') and fluentd_openobserve_backend is defined %}
-  </store>
-{% endif %}
   <buffer>
     @type file
-    path /var/log/td-agent/buffer/beats.*.buffer
+    path /var/log/td-agent/buffer/oo_beats.*.buffer
     flush_at_shutdown true
     flush_thread_count 8
   </buffer>
-  request_timeout 15s
+{% endif %}
+{% if elasticsearch_install|default('yes') and fluentd_openobserve_backend is defined %}
+  </store>
+{% endif %}
 </match>
 
 <match netdata>
@@ -515,6 +545,16 @@
   index_name netdata
   type_name netdata
   reconnect_on_error true
+  <buffer>
+    @type file
+    path /var/log/td-agent/buffer/netdata.*.buffer
+    flush_at_shutdown true
+    flush_thread_count 8
+  </buffer>
+  <format>
+    @type json
+  </format>
+  request_timeout 15s
 {% endif %}
 {% if elasticsearch_install|default('yes') and fluentd_openobserve_backend is defined %}
   </store>
@@ -530,20 +570,19 @@
     username {{ fluentd_openobserve_backend.username }}
     password {{ fluentd_openobserve_backend.password }}
   </auth>
-{% endif %}
-{% if elasticsearch_install|default('yes') and fluentd_openobserve_backend is defined %}
-  </store>
-{% endif %}
   <buffer>
     @type file
-    path /var/log/td-agent/buffer/netdata.*.buffer
+    path /var/log/td-agent/buffer/oo_netdata.*.buffer
     flush_at_shutdown true
     flush_thread_count 8
   </buffer>
   <format>
     @type json
   </format>
-  request_timeout 15s
+{% endif %}
+{% if elasticsearch_install|default('yes') and fluentd_openobserve_backend is defined %}
+  </store>
+{% endif %}
 </match>
 
 <match **>
@@ -563,6 +602,13 @@
   index_name fluentd
   type_name fluentd
   reconnect_on_error true
+  <buffer>
+    @type file
+    path /var/log/td-agent/buffer/default.*.buffer
+    flush_at_shutdown true
+    flush_thread_count 8
+  </buffer>
+  request_timeout 15s
 {% endif %}
 {% if elasticsearch_install|default('yes') and fluentd_openobserve_backend is defined %}
   </store>
@@ -578,17 +624,16 @@
     username {{ fluentd_openobserve_backend.username }}
     password {{ fluentd_openobserve_backend.password }}
   </auth>
-{% endif %}
-{% if elasticsearch_install|default('yes') and fluentd_openobserve_backend is defined %}
-  </store>
-{% endif %}
   <buffer>
     @type file
-    path /var/log/td-agent/buffer/default.*.buffer
+    path /var/log/td-agent/buffer/oo_default.*.buffer
     flush_at_shutdown true
     flush_thread_count 8
   </buffer>
-  request_timeout 15s
+{% endif %}
+{% if elasticsearch_install|default('yes') and fluentd_openobserve_backend is defined %}
+  </store>
+{% endif %}
 </match>
 {% else %}