diff --git a/packages/f5/changelog.yml b/packages/f5/changelog.yml
index bb584a0992c..bda86a7c918 100644
--- a/packages/f5/changelog.yml
+++ b/packages/f5/changelog.yml
@@ -1,4 +1,9 @@
 # newer versions go on top
+- version: "0.11.2"
+  changes:
+    - description: Remove duplicate fields.
+      type: bugfix
+      link: https://github.com/elastic/integrations/pull/4407
 - version: "0.11.1"
   changes:
     - description: Use ECS geo.location definition.
diff --git a/packages/f5/data_stream/bigipafm/fields/base-fields.yml b/packages/f5/data_stream/bigipafm/fields/base-fields.yml
index a4f2b5492fe..62774970e58 100644
--- a/packages/f5/data_stream/bigipafm/fields/base-fields.yml
+++ b/packages/f5/data_stream/bigipafm/fields/base-fields.yml
@@ -15,9 +15,6 @@
   type: constant_keyword
   description: Event dataset
   value: f5.bigipafm
-- name: '@timestamp'
-  type: date
-  description: Event timestamp.
 - name: container.id
   description: Unique container id.
   ignore_above: 1024
@@ -39,8 +36,3 @@
 - name: log.offset
   description: Offset of the entry in the log file.
   type: long
-- name: tags
-  description: List of keywords used to tag each event.
-  example: '["production", "env2"]'
-  ignore_above: 1024
-  type: keyword
diff --git a/packages/f5/data_stream/bigipapm/fields/base-fields.yml b/packages/f5/data_stream/bigipapm/fields/base-fields.yml
index 88bd33161a9..6735d33f76a 100644
--- a/packages/f5/data_stream/bigipapm/fields/base-fields.yml
+++ b/packages/f5/data_stream/bigipapm/fields/base-fields.yml
@@ -15,9 +15,6 @@
   type: constant_keyword
   description: Event dataset
   value: f5.bigipapm
-- name: '@timestamp'
-  type: date
-  description: Event timestamp.
 - name: container.id
   description: Unique container id.
   ignore_above: 1024
@@ -39,8 +36,3 @@
 - name: log.offset
   description: Offset of the entry in the log file.
   type: long
-- name: tags
-  description: List of keywords used to tag each event.
-  example: '["production", "env2"]'
-  ignore_above: 1024
-  type: keyword
diff --git a/packages/f5/manifest.yml b/packages/f5/manifest.yml
index cedaa9c4e34..a0b2da2c8bf 100644
--- a/packages/f5/manifest.yml
+++ b/packages/f5/manifest.yml
@@ -1,7 +1,7 @@
 format_version: 1.0.0
 name: f5
 title: F5 Logs
-version: "0.11.1"
+version: "0.11.2"
 description: Collect and parse logs from F5 devices with Elastic Agent.
 categories: ["network", "security"]
 release: experimental
diff --git a/packages/fim/changelog.yml b/packages/fim/changelog.yml
index 70f1140b7c5..cf850b00157 100644
--- a/packages/fim/changelog.yml
+++ b/packages/fim/changelog.yml
@@ -1,4 +1,9 @@
 # newer versions go on top
+- version: "1.2.2"
+  changes:
+    - description: Remove duplicate fields.
+      type: bugfix
+      link: https://github.com/elastic/integrations/pull/4407
 - version: "1.2.1"
   changes:
     - description: Use ECS geo.location definition.
diff --git a/packages/fim/data_stream/event/fields/agent.yml b/packages/fim/data_stream/event/fields/agent.yml
index e313ec82874..f027c185f47 100644
--- a/packages/fim/data_stream/event/fields/agent.yml
+++ b/packages/fim/data_stream/event/fields/agent.yml
@@ -77,11 +77,6 @@
       type: object
       object_type: keyword
       description: Image labels.
-    - name: name
-      level: extended
-      type: keyword
-      ignore_above: 1024
-      description: Container name.
 - name: host
   title: Host
   group: 2
@@ -90,12 +85,6 @@
     ECS host.* fields should be populated with details about the host on which the event happened, or from which the measurement was taken. Host types include hardware, virtual machines, Docker containers, and Kubernetes nodes.'
   type: group
   fields:
-    - name: architecture
-      level: core
-      type: keyword
-      ignore_above: 1024
-      description: Operating system architecture.
-      example: x86_64
     - name: domain
       level: extended
       type: keyword
diff --git a/packages/fim/manifest.yml b/packages/fim/manifest.yml
index 0953b68bc19..e27ae4f5604 100644
--- a/packages/fim/manifest.yml
+++ b/packages/fim/manifest.yml
@@ -1,7 +1,7 @@
 format_version: 1.0.0
 name: fim
 title: "File Integrity Monitoring"
-version: "1.2.1"
+version: "1.2.2"
 license: basic
 release: ga
 description: "The File Integrity Monitoring integration reports filesystem changes in real time."
diff --git a/packages/fireeye/changelog.yml b/packages/fireeye/changelog.yml
index fae686d1a6e..81a8bfcc115 100644
--- a/packages/fireeye/changelog.yml
+++ b/packages/fireeye/changelog.yml
@@ -1,3 +1,8 @@
+- version: "1.6.2"
+  changes:
+    - description: Remove duplicate fields.
+      type: bugfix
+      link: https://github.com/elastic/integrations/pull/4407
 - version: "1.6.1"
   changes:
     - description: Use ECS geo.location definition.
diff --git a/packages/fireeye/data_stream/nx/fields/agent.yml b/packages/fireeye/data_stream/nx/fields/agent.yml
index a371c03d96d..368be734273 100644
--- a/packages/fireeye/data_stream/nx/fields/agent.yml
+++ b/packages/fireeye/data_stream/nx/fields/agent.yml
@@ -107,10 +107,6 @@
       type: keyword
       ignore_above: 1024
       description: "Unique host id.\nAs hostname is not always unique, use values that are meaningful in your environment.\nExample: The current usage of `beat.name`."
-    - name: ip
-      level: core
-      type: ip
-      description: Host ip addresses.
     - name: mac
       level: core
       type: keyword
diff --git a/packages/fireeye/data_stream/nx/fields/ecs.yml b/packages/fireeye/data_stream/nx/fields/ecs.yml
index cfe509dd51a..f9a72030832 100644
--- a/packages/fireeye/data_stream/nx/fields/ecs.yml
+++ b/packages/fireeye/data_stream/nx/fields/ecs.yml
@@ -62,8 +62,6 @@
   name: source.ip
 - external: ecs
   name: destination.address
-- external: ecs
-  name: destination.port
 - external: ecs
   name: destination.as.number
 - external: ecs
diff --git a/packages/fireeye/manifest.yml b/packages/fireeye/manifest.yml
index 969382eefd7..67bc3a0e989 100644
--- a/packages/fireeye/manifest.yml
+++ b/packages/fireeye/manifest.yml
@@ -1,7 +1,7 @@
 format_version: 1.0.0
 name: fireeye
 title: "FireEye Network Security"
-version: 1.6.1
+version: 1.6.2
 license: basic
 description: Collect logs from FireEye NX with Elastic Agent.
 type: integration
diff --git a/packages/fortinet_forticlient/changelog.yml b/packages/fortinet_forticlient/changelog.yml
index 30eb3c1047c..eca1bc56337 100644
--- a/packages/fortinet_forticlient/changelog.yml
+++ b/packages/fortinet_forticlient/changelog.yml
@@ -1,4 +1,9 @@
 # newer versions go on top
+- version: "1.1.3"
+  changes:
+    - description: Remove duplicate fields.
+      type: bugfix
+      link: https://github.com/elastic/integrations/pull/4407
 - version: "1.1.2"
   changes:
     - description: Remove duplicate field.
diff --git a/packages/fortinet_forticlient/data_stream/log/fields/agent.yml b/packages/fortinet_forticlient/data_stream/log/fields/agent.yml
index 38bb8dcec56..e0f9e38998f 100644
--- a/packages/fortinet_forticlient/data_stream/log/fields/agent.yml
+++ b/packages/fortinet_forticlient/data_stream/log/fields/agent.yml
@@ -62,11 +62,6 @@
     These fields help correlate data based containers from any runtime.'
   type: group
   fields:
-    - name: id
-      level: core
-      type: keyword
-      ignore_above: 1024
-      description: Unique container id.
     - name: image.name
       level: extended
       type: keyword
diff --git a/packages/fortinet_forticlient/data_stream/log/fields/base-fields.yml b/packages/fortinet_forticlient/data_stream/log/fields/base-fields.yml
index 4c654c09dcd..aa4e6d0ed0c 100644
--- a/packages/fortinet_forticlient/data_stream/log/fields/base-fields.yml
+++ b/packages/fortinet_forticlient/data_stream/log/fields/base-fields.yml
@@ -36,8 +36,3 @@
 - name: log.offset
   description: Offset of the entry in the log file.
   type: long
-- name: tags
-  description: List of keywords used to tag each event.
-  example: '["production", "env2"]'
-  ignore_above: 1024
-  type: keyword
diff --git a/packages/fortinet_forticlient/manifest.yml b/packages/fortinet_forticlient/manifest.yml
index 3a3cd8e556d..e0318fee5a2 100644
--- a/packages/fortinet_forticlient/manifest.yml
+++ b/packages/fortinet_forticlient/manifest.yml
@@ -1,6 +1,6 @@
 name: fortinet_forticlient
 title: Fortinet FortiClient Logs
-version: 1.1.2
+version: 1.1.3
 release: ga
 description: Collect logs from Fortinet FortiClient instances with Elastic Agent.
 type: integration
diff --git a/packages/fortinet_fortigate/changelog.yml b/packages/fortinet_fortigate/changelog.yml
index e82be4bb65d..0a6cd4167fb 100644
--- a/packages/fortinet_fortigate/changelog.yml
+++ b/packages/fortinet_fortigate/changelog.yml
@@ -1,4 +1,9 @@
 # newer versions go on top
+- version: "1.2.4"
+  changes:
+    - description: Remove duplicate fields.
+      type: bugfix
+      link: https://github.com/elastic/integrations/pull/4407
 - version: "1.2.3"
   changes:
     - description: Remove duplicate field.
diff --git a/packages/fortinet_fortigate/data_stream/log/fields/agent.yml b/packages/fortinet_fortigate/data_stream/log/fields/agent.yml
index f6127c3e224..8e774447801 100644
--- a/packages/fortinet_fortigate/data_stream/log/fields/agent.yml
+++ b/packages/fortinet_fortigate/data_stream/log/fields/agent.yml
@@ -58,11 +58,6 @@
   description: "Container fields are used for meta information about the specific container that is the source of information.\nThese fields help correlate data based containers from any runtime."
   type: group
   fields:
-    - name: id
-      level: core
-      type: keyword
-      ignore_above: 1024
-      description: Unique container id.
     - name: image.name
       level: extended
       type: keyword
diff --git a/packages/fortinet_fortigate/manifest.yml b/packages/fortinet_fortigate/manifest.yml
index c22c8773227..821e69fafe1 100644
--- a/packages/fortinet_fortigate/manifest.yml
+++ b/packages/fortinet_fortigate/manifest.yml
@@ -1,6 +1,6 @@
 name: fortinet_fortigate
 title: Fortinet FortiGate Firewall Logs
-version: 1.2.3
+version: 1.2.4
 release: ga
 description: Collect logs from Fortinet FortiGate firewalls with Elastic Agent.
 type: integration
diff --git a/packages/fortinet_fortimail/data_stream/log/fields/agent.yml b/packages/fortinet_fortimail/data_stream/log/fields/agent.yml
index 38bb8dcec56..e0f9e38998f 100644
--- a/packages/fortinet_fortimail/data_stream/log/fields/agent.yml
+++ b/packages/fortinet_fortimail/data_stream/log/fields/agent.yml
@@ -62,11 +62,6 @@
     These fields help correlate data based containers from any runtime.'
   type: group
   fields:
-    - name: id
-      level: core
-      type: keyword
-      ignore_above: 1024
-      description: Unique container id.
     - name: image.name
       level: extended
       type: keyword
diff --git a/packages/fortinet_fortimail/data_stream/log/fields/base-fields.yml b/packages/fortinet_fortimail/data_stream/log/fields/base-fields.yml
index 141913f4eed..7349ec3ac75 100644
--- a/packages/fortinet_fortimail/data_stream/log/fields/base-fields.yml
+++ b/packages/fortinet_fortimail/data_stream/log/fields/base-fields.yml
@@ -36,8 +36,3 @@
 - name: log.offset
   description: Offset of the entry in the log file.
   type: long
-- name: tags
-  description: List of keywords used to tag each event.
-  example: '["production", "env2"]'
-  ignore_above: 1024
-  type: keyword
diff --git a/packages/fortinet_fortimanager/changelog.yml b/packages/fortinet_fortimanager/changelog.yml
index 5390f3a7212..c903c782330 100644
--- a/packages/fortinet_fortimanager/changelog.yml
+++ b/packages/fortinet_fortimanager/changelog.yml
@@ -1,4 +1,9 @@
 # newer versions go on top
+- version: "1.1.3"
+  changes:
+    - description: Remove duplicate fields.
+      type: bugfix
+      link: https://github.com/elastic/integrations/pull/4407
 - version: "1.1.2"
   changes:
     - description: Remove duplicate field.
diff --git a/packages/fortinet_fortimanager/data_stream/log/fields/agent.yml b/packages/fortinet_fortimanager/data_stream/log/fields/agent.yml
index 38bb8dcec56..e0f9e38998f 100644
--- a/packages/fortinet_fortimanager/data_stream/log/fields/agent.yml
+++ b/packages/fortinet_fortimanager/data_stream/log/fields/agent.yml
@@ -62,11 +62,6 @@
     These fields help correlate data based containers from any runtime.'
   type: group
   fields:
-    - name: id
-      level: core
-      type: keyword
-      ignore_above: 1024
-      description: Unique container id.
     - name: image.name
       level: extended
       type: keyword
diff --git a/packages/fortinet_fortimanager/data_stream/log/fields/base-fields.yml b/packages/fortinet_fortimanager/data_stream/log/fields/base-fields.yml
index 9c4bf744d1a..dbb394f2670 100644
--- a/packages/fortinet_fortimanager/data_stream/log/fields/base-fields.yml
+++ b/packages/fortinet_fortimanager/data_stream/log/fields/base-fields.yml
@@ -36,8 +36,3 @@
 - name: log.offset
   description: Offset of the entry in the log file.
   type: long
-- name: tags
-  description: List of keywords used to tag each event.
-  example: '["production", "env2"]'
-  ignore_above: 1024
-  type: keyword
diff --git a/packages/fortinet_fortimanager/manifest.yml b/packages/fortinet_fortimanager/manifest.yml
index 4c40073a857..9b55ff1b02a 100644
--- a/packages/fortinet_fortimanager/manifest.yml
+++ b/packages/fortinet_fortimanager/manifest.yml
@@ -1,6 +1,6 @@
 name: fortinet_fortimanager
 title: Fortinet FortiManager Logs
-version: 1.1.2
+version: 1.1.3
 release: ga
 description: Collect logs from Fortinet FortiManager instances with Elastic Agent.
 type: integration