diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
index 500ccddaa84..93bae39ef96 100644
--- a/CHANGELOG.next.asciidoc
+++ b/CHANGELOG.next.asciidoc
@@ -818,6 +818,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Add `proxy_url` config for httpjson v2 input. {issue}24615[24615] {pull}24662[24662]
 - Add support for upper case field names in Sophos XG module {pull}24693[24693]
 - Add `fail_on_template_error` option for httpjson input. {pull}24784[24784]
+- Change `okta.target` to `flattened` field type.  {issue}24354[24354] {pull}24636[24636]
 
 *Heartbeat*
 
diff --git a/filebeat/docs/fields.asciidoc b/filebeat/docs/fields.asciidoc
index aacbcced14c..e59ddb41c00 100644
--- a/filebeat/docs/fields.asciidoc
+++ b/filebeat/docs/fields.asciidoc
@@ -112258,7 +112258,7 @@ type: keyword
 The list of targets.
 
 
-type: array
+type: flattened
 
 --
 
diff --git a/x-pack/filebeat/module/okta/fields.go b/x-pack/filebeat/module/okta/fields.go
index 24c40aebc4f..749c3ee54db 100644
--- a/x-pack/filebeat/module/okta/fields.go
+++ b/x-pack/filebeat/module/okta/fields.go
@@ -19,5 +19,5 @@ func init() {
 // AssetOkta returns asset data.
 // This is the base64 encoded gzipped contents of module/okta.
 func AssetOkta() string {
-	return "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"
+	return "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"
 }
diff --git a/x-pack/filebeat/module/okta/system/_meta/fields.yml b/x-pack/filebeat/module/okta/system/_meta/fields.yml
index 5bf5ee9c8d5..794d1cfa770 100644
--- a/x-pack/filebeat/module/okta/system/_meta/fields.yml
+++ b/x-pack/filebeat/module/okta/system/_meta/fields.yml
@@ -62,7 +62,7 @@
       Display name of the actor.
 
 - name: client
-  title: Client 
+  title: Client
   short: Fields about the client of the actor.
   description: >
     Fields that let you store information about the client of the actor.
@@ -73,18 +73,18 @@
     type: ip
     description: >
       The IP address of the client.
-    
+
   - name: user_agent
     description: >
       Fields about the user agent information of the client.
     type: group
     fields:
- 
+
     - name: raw_user_agent
       type: keyword
       description: >
         The raw informaton of the user agent.
-    
+
     - name: os
       type: keyword
       description: >
@@ -133,7 +133,7 @@
   short: The list of targets.
   description: >
     The list of targets.
-  type: array
+  type: flattened
   fields:
 
   - name: id
@@ -275,7 +275,7 @@
   type: group
   fields:
 
-  - name: as 
+  - name: as
     type: group
     description: >
       The autonomous system.
@@ -291,7 +291,7 @@
       description: >
         The organization that owns the AS number.
       fields:
-      
+
       - name: name
         type: keyword
         description: >