diff --git a/salt/logstash/pipelines/config/so/9805_output_elastic_agent.conf.jinja b/salt/logstash/pipelines/config/so/9805_output_elastic_agent.conf.jinja
index 0a148155c..f7671e2b7 100644
--- a/salt/logstash/pipelines/config/so/9805_output_elastic_agent.conf.jinja
+++ b/salt/logstash/pipelines/config/so/9805_output_elastic_agent.conf.jinja
@@ -1,13 +1,16 @@
 output {
   if "elastic-agent" in [tags] {
-      if [metadata][pipeline] {
+    if [metadata][pipeline] {
+      if [metadata][_id] {
         elasticsearch {
           hosts => "{{ GLOBALS.manager }}"
           ecs_compatibility => v8
           data_stream => true
           user => "{{ ES_USER }}"
           password => "{{ ES_PASS }}"
+          document_id => "%{[metadata][_id]}"
           pipeline => "%{[metadata][pipeline]}"
+          silence_errors_in_log => ["version_conflict_engine_exception"]
           ssl => true
           ssl_certificate_verification => false
         }
@@ -19,10 +22,22 @@ output {
           data_stream => true
           user => "{{ ES_USER }}"
           password => "{{ ES_PASS }}"
+          pipeline => "%{[metadata][pipeline]}"
           ssl => true
-          ssl_certificate_verification => false    
+          ssl_certificate_verification => false
         }
-     }
+      }
+    }
+    else {
+      elasticsearch {
+        hosts => "{{ GLOBALS.manager }}"
+        ecs_compatibility => v8
+        data_stream => true
+        user => "{{ ES_USER }}"
+        password => "{{ ES_PASS }}"
+        ssl => true
+        ssl_certificate_verification => false
+      }
+    }
   }
 }
-