diff --git a/dev-upgrade/elastic/filebeat.yaml b/dev-upgrade/elastic/filebeat.yaml
index 9bd6603..920c417 100644
--- a/dev-upgrade/elastic/filebeat.yaml
+++ b/dev-upgrade/elastic/filebeat.yaml
@@ -26,7 +26,7 @@ data:
     processors:
     - add_cloud_metadata: ~
     - drop_fields:
-        fields: ["ecs","agent.type","agent.id","agent.version","agent.ephemeral_id","agent.name"]
+        fields: ["ecs","agent"]
 
     filebeat.inputs:
     - type: log
diff --git a/prod-upgrade/elastic/filebeat.yaml b/prod-upgrade/elastic/filebeat.yaml
index 7412b8f..5aebeba 100644
--- a/prod-upgrade/elastic/filebeat.yaml
+++ b/prod-upgrade/elastic/filebeat.yaml
@@ -26,7 +26,7 @@ data:
     processors:
     - add_cloud_metadata: ~
     - drop_fields:
-        fields: ["ecs","agent.type","agent.id","agent.version","agent.ephemeral_id","agent.name"]
+        fields: ["ecs","agent"]
 
     filebeat.inputs:
     - type: log
diff --git a/tcs-upgrade/elastic/filebeat.yaml b/tcs-upgrade/elastic/filebeat.yaml
index 88d954e..6f187bb 100644
--- a/tcs-upgrade/elastic/filebeat.yaml
+++ b/tcs-upgrade/elastic/filebeat.yaml
@@ -26,7 +26,7 @@ data:
     processors:
     - add_cloud_metadata: ~
     - drop_fields:
-        fields: ["ecs","agent.type","agent.id","agent.version","agent.ephemeral_id","agent.name"]
+        fields: ["ecs","agent"]
 
     filebeat.inputs:
     - type: log