diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
index daeef17620a..3fd03649040 100644
--- a/CHANGELOG.next.asciidoc
+++ b/CHANGELOG.next.asciidoc
@@ -74,6 +74,8 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Several text fields in the Elasticsearch module are now indexed as `keyword` fields with `text` multi-fields (ECS). {pull}10414[10414]
 - Move dissect pattern for traefik.access fileset from Filbeat to Elasticsearch. {pull}10442[10442]
 - The `elasticsearch/deprecation` fileset now indexes the `component` field under `elasticsearch` instead of `elasticsearch.server`. {pull}10445[10445]
+- Remove field `kafka.log.trace.full` from kafka.log fielset. {pull}10398[10398]
+- Change field `kafka.log.class` for kafka.log fileset from text to keyword. {pull}10398[10398]
 
 *Heartbeat*
 
diff --git a/filebeat/docs/fields.asciidoc b/filebeat/docs/fields.asciidoc
index 752d9ffa424..d174f42f686 100644
--- a/filebeat/docs/fields.asciidoc
+++ b/filebeat/docs/fields.asciidoc
@@ -6442,7 +6442,7 @@ Component the log is coming from.
 *`kafka.log.class`*::
 +
 --
-type: text
+type: keyword
 
 Java class the log is coming from.
 
@@ -6474,16 +6474,6 @@ type: text
 Message part of the trace.
 
 
---
-
-*`kafka.log.trace.full`*::
-+
---
-type: text
-
-The full trace in the log line.
-
-
 --
 
 [[exported-fields-kibana]]
diff --git a/filebeat/module/kafka/fields.go b/filebeat/module/kafka/fields.go
index 910a1dade19..ed538d21f99 100644
--- a/filebeat/module/kafka/fields.go
+++ b/filebeat/module/kafka/fields.go
@@ -32,5 +32,5 @@ func init() {
 // AssetKafka returns asset data.
 // This is the base64 encoded gzipped contents of module/kafka.
 func AssetKafka() string {
-	return "eJysk09uszAQxfec4in7cAAW3+bbteouFxiFgVgY27KHtLl9Zdz8c51ApM4OD37vx5thi4FPDQbqBqoAUaK5weY9Pm8qoOWw98qJsqbBvwoA5h5G206aK6BTrNvQzK0tDI18lYslJ8cNem8n93NS0LyXuZXStr+clcQeCqZKsNr20MpwqG+aueOdKx9Z33XO3qQVhazjSA4zaV26N6reU2ITP3HRb+QQqOcXHcu3HvkVjfd2dNawkaL1wKdP69us9yTuWP/PkpADz9GrEH2U6dF5O9ZlEE0h/8oEIfyV0y0QvNGRkuBLCOJpXx5BvnArGIBdlIMyF4a4gXX2YmkJl2LBwnxW0f1KSRLuk5ywuLB4NrSVWMBH0oYjL7Ddle4xTjfp/Lf7G5bdgWfxczz5NL8DAAD//1wZSZY="
+	return "eJykkjtuwzAQRHudYuDeOoCKNOkSpMsFFtZKJsQfyLUT3z6gGP8Y2paR7cQRZ55Gu8bEhw4TDRM1gCjR3GH1np5XDdBz3ATlRTnb4aUBgFmDcf1OcwMMinUfu1law5Lhs10aOXjuMAa3878nFc9rm0sr7cbTWc3spmGeDKvdCK0sx/ZCLBOvUnnP+ko5ZpNWFAvFk2xn0rZ2z6gxUGaTsONqnuEYaeQnE+u3buVVgzfOeGfZSjV64sOXC32h3ak7zevRErLluXoVU46yI4bgTFsH0RTLr/wHxBvtKXs+RSGBNvW/UO7cAgbgM9lB2RNDWsK2eLG2h4+aedTOIro/LUnGvdMTHu7smUz4u9yqhVjAR/aGpyBww5mubX4CAAD//40BKYM="
 }
diff --git a/filebeat/module/kafka/log/_meta/fields.yml b/filebeat/module/kafka/log/_meta/fields.yml
index 76d9467bb04..c06f44d0bf4 100644
--- a/filebeat/module/kafka/log/_meta/fields.yml
+++ b/filebeat/module/kafka/log/_meta/fields.yml
@@ -17,7 +17,7 @@
       description: >
         Component the log is coming from.
     - name: class
-      type: text
+      type: keyword
       description: >
         Java class the log is coming from.
     - name: trace
@@ -33,7 +33,3 @@
           type: text
           description: >
               Message part of the trace.
-        - name: full
-          type: text
-          description: >
-              The full trace in the log line.
diff --git a/filebeat/module/kafka/log/ingest/pipeline.json b/filebeat/module/kafka/log/ingest/pipeline.json
index a021c6a8386..cde66f21dfc 100644
--- a/filebeat/module/kafka/log/ingest/pipeline.json
+++ b/filebeat/module/kafka/log/ingest/pipeline.json
@@ -45,6 +45,12 @@
         ]
       }
     },
+    {
+      "remove": {
+        "field": "kafka.log.trace.full",
+        "ignore_missing": true
+      }
+    },
     {
       "rename": {
         "field": "@timestamp",