You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2026/05/06 13:31:41 UTC

(camel) branch main updated: CAMEL-23418: camel-ocsf - Upgrade OCSF schema to 1.8.0 (#23010)

This is an automated email from the ASF dual-hosted git repository.

oscerd pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
     new 72d72bd4ff1e CAMEL-23418: camel-ocsf - Upgrade OCSF schema to 1.8.0 (#23010)
72d72bd4ff1e is described below

commit 72d72bd4ff1e70b0baded960932e9ddd8ad0fc61
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed May 6 15:31:34 2026 +0200

    CAMEL-23418: camel-ocsf - Upgrade OCSF schema to 1.8.0 (#23010)
    
    * CAMEL-23418: camel-ocsf - Upgrade OCSF schema to 1.8.0
    
    Regenerate the OCSF JSON schemas from version 1.8.0 of the official
    OCSF specification, refresh the bundled POJOs, and bump the supported
    schema version constant.
    
    Also enhance the schema generator to fall back to downloading the
    schema from schema.ocsf.io when the requested version is not yet
    bundled in the ocsf-json-schema Python package (1.8.0 is not packaged
    as of ocsf-json-schema 1.1.0), and add Packet and Token to the
    generated objects since they are now referenced by network classes
    and the api object respectively in 1.8.0.
    
    Signed-off-by: Andrea Cosentino <an...@gmail.com>
    
    * CAMEL-23418: camel-ocsf - Fix asciidoc warnings in upgrade docs
    
    Move the schema download fallback NOTE out of the numbered list so it
    no longer breaks the list numbering, and escape the {version}
    placeholder in the URL so AsciiDoc treats it as a literal instead of
    trying to resolve a missing 'version' attribute.
    
    Signed-off-by: Andrea Cosentino <an...@gmail.com>
    
    ---------
    
    Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
 .../camel-ocsf/src/main/docs/ocsf-dataformat.adoc  |  15 +-
 .../camel/dataformat/ocsf/OcsfConstants.java       |   2 +-
 .../src/main/resources/schema/Account.json         |  14 +-
 .../src/main/resources/schema/AccountChange.json   |  44 ++--
 .../src/main/resources/schema/Actor.json           |   2 +-
 .../src/main/resources/schema/Agent.json           |   2 +-
 .../src/main/resources/schema/Analytic.json        |   2 +-
 .../camel-ocsf/src/main/resources/schema/Api.json  |   5 +-
 .../src/main/resources/schema/ApiActivity.json     |  36 +--
 .../src/main/resources/schema/Attack.json          |   2 +-
 .../src/main/resources/schema/AuthFactor.json      |   2 +-
 .../src/main/resources/schema/Authentication.json  | 122 ++++-----
 .../src/main/resources/schema/Authorization.json   |   2 +-
 .../main/resources/schema/AuthorizeSession.json    |  52 ++--
 .../src/main/resources/schema/Certificate.json     |  10 +-
 .../src/main/resources/schema/Cloud.json           |   4 +-
 .../src/main/resources/schema/Compliance.json      |   2 +-
 .../main/resources/schema/ComplianceFinding.json   |  72 +++---
 .../src/main/resources/schema/Container.json       |   2 +-
 .../camel-ocsf/src/main/resources/schema/Cve.json  |   2 +-
 .../camel-ocsf/src/main/resources/schema/Cvss.json |   2 +-
 .../camel-ocsf/src/main/resources/schema/Cwe.json  |   2 +-
 .../main/resources/schema/DatastoreActivity.json   |  62 ++---
 .../main/resources/schema/DetectionFinding.json    | 132 +++++-----
 .../src/main/resources/schema/Device.json          | 279 +++++++++++----------
 .../src/main/resources/schema/DhcpActivity.json    |  90 ++++---
 .../src/main/resources/schema/Display.json         |  10 +-
 .../src/main/resources/schema/DnsActivity.json     |  96 ++++---
 .../src/main/resources/schema/DnsQuery.json        |  10 +-
 .../src/main/resources/schema/EmailActivity.json   |  84 +++----
 .../src/main/resources/schema/Endpoint.json        |  17 +-
 .../src/main/resources/schema/Enrichment.json      |   2 +-
 .../main/resources/schema/EntityManagement.json    |  56 ++---
 .../camel-ocsf/src/main/resources/schema/Epss.json |   2 +-
 .../src/main/resources/schema/Extension.json       |   2 +-
 .../src/main/resources/schema/Feature.json         |   2 +-
 .../camel-ocsf/src/main/resources/schema/File.json | 209 ++++++++-------
 .../src/main/resources/schema/FileActivity.json    |  56 ++---
 .../src/main/resources/schema/FindingInfo.json     |   2 +-
 .../src/main/resources/schema/Fingerprint.json     |   5 +-
 .../src/main/resources/schema/FtpActivity.json     | 116 +++++----
 .../src/main/resources/schema/Group.json           |   8 +-
 .../src/main/resources/schema/GroupManagement.json |  52 ++--
 .../src/main/resources/schema/HttpActivity.json    |  96 ++++---
 .../src/main/resources/schema/HttpHeader.json      |   2 +-
 .../src/main/resources/schema/HttpRequest.json     |  18 +-
 .../src/main/resources/schema/HttpResponse.json    |   2 +-
 .../camel-ocsf/src/main/resources/schema/Idp.json  |   2 +-
 .../src/main/resources/schema/Image.json           |   2 +-
 .../src/main/resources/schema/IncidentFinding.json | 118 ++++-----
 .../src/main/resources/schema/Ja4Fingerprint.json  |   2 +-
 .../src/main/resources/schema/KbArticle.json       |   2 +-
 .../src/main/resources/schema/KernelActivity.json  |  22 +-
 .../resources/schema/KernelExtensionActivity.json  |  22 +-
 .../src/main/resources/schema/KillChainPhase.json  |   2 +-
 .../src/main/resources/schema/Location.json        |   4 +-
 .../src/main/resources/schema/Logger.json          |   2 +-
 .../src/main/resources/schema/Malware.json         |   2 +-
 .../src/main/resources/schema/MemoryActivity.json  |  44 ++--
 .../src/main/resources/schema/Metadata.json        | 186 +++++++-------
 .../src/main/resources/schema/Module.json          |   2 +-
 .../src/main/resources/schema/ModuleActivity.json  |  20 +-
 .../src/main/resources/schema/NetworkActivity.json |  84 ++++---
 .../src/main/resources/schema/NetworkEndpoint.json |  24 +-
 .../main/resources/schema/NetworkFileActivity.json |  82 +++---
 .../main/resources/schema/NetworkInterface.json    |  10 +-
 .../src/main/resources/schema/NtpActivity.json     | 102 ++++----
 .../src/main/resources/schema/Observable.json      |   2 +-
 .../src/main/resources/schema/OcsfEvent.json       |   2 +-
 .../src/main/resources/schema/Organization.json    |   2 +-
 .../camel-ocsf/src/main/resources/schema/Os.json   |  10 +-
 .../src/main/resources/schema/Package.json         |   2 +-
 .../src/main/resources/schema/Packet.json          |  51 ++++
 .../src/main/resources/schema/Policy.json          |   2 +-
 .../src/main/resources/schema/Process.json         |   2 +-
 .../src/main/resources/schema/ProcessActivity.json |  64 ++---
 .../src/main/resources/schema/Product.json         |   2 +-
 .../src/main/resources/schema/RdpActivity.json     | 126 +++++-----
 .../src/main/resources/schema/Remediation.json     |   2 +-
 .../main/resources/schema/RemediationActivity.json |  30 +--
 .../src/main/resources/schema/Reputation.json      |   2 +-
 .../src/main/resources/schema/Request.json         |   2 +-
 .../src/main/resources/schema/ResourceDetails.json |  10 +-
 .../src/main/resources/schema/Response.json        |   2 +-
 .../camel-ocsf/src/main/resources/schema/Rule.json |   2 +-
 .../camel-ocsf/src/main/resources/schema/San.json  |   2 +-
 .../camel-ocsf/src/main/resources/schema/Scan.json |   2 +-
 .../src/main/resources/schema/ScanActivity.json    |  74 +++---
 .../resources/schema/ScheduledJobActivity.json     |  22 +-
 .../src/main/resources/schema/SecurityFinding.json | 164 ++++++------
 .../src/main/resources/schema/Service.json         |   2 +-
 .../src/main/resources/schema/Session.json         |   2 +-
 .../src/main/resources/schema/SmbActivity.json     | 130 +++++-----
 .../src/main/resources/schema/SshActivity.json     |  96 ++++---
 .../src/main/resources/schema/SubTechnique.json    |   2 +-
 .../src/main/resources/schema/Tactic.json          |   2 +-
 .../src/main/resources/schema/Technique.json       |   2 +-
 .../src/main/resources/schema/Ticket.json          |   2 +-
 .../camel-ocsf/src/main/resources/schema/Tls.json  |  10 +-
 .../src/main/resources/schema/Token.json           |  54 ++++
 .../camel-ocsf/src/main/resources/schema/Url.json  | 142 +++++------
 .../camel-ocsf/src/main/resources/schema/User.json |  14 +-
 .../src/main/resources/schema/UserAccess.json      |  46 ++--
 .../main/resources/schema/VendorAttributes.json    |   2 +-
 .../src/main/resources/schema/Vulnerability.json   |  10 +-
 .../resources/schema/VulnerabilityFinding.json     |  58 ++---
 .../resources/schema/WebResourcesActivity.json     |  42 ++--
 .../src/main/script/generate-ocsf-schemas.py       |  45 +++-
 .../dataformat/ocsf/OcsfEventExampleTest.java      |  10 +-
 .../resources/ocsf-detection-finding-example.json  |   2 +-
 110 files changed, 2072 insertions(+), 1722 deletions(-)

diff --git a/components/camel-ocsf/src/main/docs/ocsf-dataformat.adoc b/components/camel-ocsf/src/main/docs/ocsf-dataformat.adoc
index 252123466703..daf52fc1c38a 100644
--- a/components/camel-ocsf/src/main/docs/ocsf-dataformat.adoc
+++ b/components/camel-ocsf/src/main/docs/ocsf-dataformat.adoc
@@ -17,7 +17,7 @@ OCSF is an open-source standard for cybersecurity event logging and data normali
 
 == Supported OCSF Event Classes
 
-This data format includes POJOs for 34 OCSF event classes and 68 reusable object types. Key event classes include:
+This data format includes POJOs for 34 OCSF event classes and 70 reusable object types (based on OCSF schema 1.8.0). Key event classes include:
 
 *Findings (Category 2):*
 
@@ -316,8 +316,8 @@ Reusable objects used within event classes:
 * `Cloud`, `Container`, `Image` - Cloud and container objects
 * `Metadata`, `Product`, `Observable`, `Enrichment` - Metadata objects
 * `Certificate`, `Tls`, `Fingerprint` - Cryptographic objects
-* `HttpRequest`, `HttpResponse`, `DnsQuery`, `Url` - Network protocol objects
-* `Location`, `Organization`, `Service` - Context objects
+* `HttpRequest`, `HttpResponse`, `DnsQuery`, `Url`, `Packet` - Network protocol objects
+* `Location`, `Organization`, `Service`, `Token` - Context objects
 * `Cve`, `Cvss`, `Cwe`, `Epss` - Vulnerability reference objects
 
 == Updating OCSF Schema Version
@@ -344,7 +344,7 @@ To update the OCSF model classes to a new version:
 [source,bash]
 ----
 cd src/main/script
-python3 generate-ocsf-schemas.py --version 1.7.0 --output ../resources/schema --clean
+python3 generate-ocsf-schemas.py --version 1.8.0 --output ../resources/schema --clean
 ----
 
 2. Build and test to verify the changes (Java classes are generated automatically during build):
@@ -356,6 +356,11 @@ mvn clean test
 
 3. Commit the updated JSON schema files.
 
+NOTE: The script first tries to load the requested OCSF version from the
+bundled `ocsf-json-schema` Python package. If the version is not bundled
+yet (typical for the most recent OCSF release), the script automatically
+downloads the schema from `https://schema.ocsf.io/\{version}/export/schema`.
+
 === Script Options
 
 The script supports the following options:
@@ -364,7 +369,7 @@ The script supports the following options:
 |===
 |Option |Default |Description
 
-|`--version`, `-v` |1.7.0 |OCSF schema version to generate
+|`--version`, `-v` |1.8.0 |OCSF schema version to generate
 |`--output`, `-o` |../resources/schema |Output directory for schema files
 |`--clean` |false |Remove existing schema files before generating
 |`--all-classes` |false |Generate all available event classes (not just the default list)
diff --git a/components/camel-ocsf/src/main/java/org/apache/camel/dataformat/ocsf/OcsfConstants.java b/components/camel-ocsf/src/main/java/org/apache/camel/dataformat/ocsf/OcsfConstants.java
index 9b34872fe657..35b527fa3014 100644
--- a/components/camel-ocsf/src/main/java/org/apache/camel/dataformat/ocsf/OcsfConstants.java
+++ b/components/camel-ocsf/src/main/java/org/apache/camel/dataformat/ocsf/OcsfConstants.java
@@ -29,7 +29,7 @@ public final class OcsfConstants {
     /**
      * Current OCSF schema version supported.
      */
-    public static final String SCHEMA_VERSION = "1.7.0";
+    public static final String SCHEMA_VERSION = "1.8.0";
 
     // OCSF Event Categories
     public static final int CATEGORY_UNCATEGORIZED = 0;
diff --git a/components/camel-ocsf/src/main/resources/schema/Account.json b/components/camel-ocsf/src/main/resources/schema/Account.json
index 68817da60f12..bfe74edca10c 100644
--- a/components/camel-ocsf/src/main/resources/schema/Account.json
+++ b/components/camel-ocsf/src/main/resources/schema/Account.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/account",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/account",
   "title": "Account",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.Account",
@@ -36,6 +36,18 @@
     "type_id": {
       "type": "integer",
       "title": "Type ID"
+    },
+    "is_disabled": {
+      "type": "boolean",
+      "title": "Disabled"
+    },
+    "is_locked": {
+      "type": "boolean",
+      "title": "Locked"
+    },
+    "is_on_premises_sync_enabled": {
+      "type": "boolean",
+      "title": "On-Premises Sync Enabled"
     }
   },
   "description": "The Account object."
diff --git a/components/camel-ocsf/src/main/resources/schema/AccountChange.json b/components/camel-ocsf/src/main/resources/schema/AccountChange.json
index 55c19e46c5f9..537f95a0214e 100644
--- a/components/camel-ocsf/src/main/resources/schema/AccountChange.json
+++ b/components/camel-ocsf/src/main/resources/schema/AccountChange.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/classes/account_change",
+  "$id": "https://schema.ocsf.io/1.8.0/classes/account_change",
   "title": "AccountChange",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.AccountChange",
@@ -9,16 +9,18 @@
     "$ref": "OcsfEvent.json"
   },
   "properties": {
-    "actor": {
-      "$ref": "Actor.json"
-    },
-    "raw_data_size": {
-      "type": "integer",
-      "title": "Raw Data Size"
+    "src_endpoint": {
+      "$ref": "NetworkEndpoint.json"
     },
     "http_response": {
       "$ref": "HttpResponse.json"
     },
+    "user": {
+      "$ref": "User.json"
+    },
+    "actor": {
+      "$ref": "Actor.json"
+    },
     "policies": {
       "type": "array",
       "description": "",
@@ -26,21 +28,14 @@
         "$ref": "Policy.json"
       }
     },
-    "enrichments": {
-      "type": "array",
-      "description": "",
-      "items": {
-        "$ref": "Enrichment.json"
-      }
+    "user_result": {
+      "$ref": "User.json"
     },
     "http_request": {
       "$ref": "HttpRequest.json"
     },
-    "src_endpoint": {
-      "$ref": "NetworkEndpoint.json"
-    },
-    "user": {
-      "$ref": "User.json"
+    "policy": {
+      "$ref": "Policy.json"
     },
     "auth_factors": {
       "type": "array",
@@ -49,14 +44,19 @@
         "$ref": "AuthFactor.json"
       }
     },
-    "user_result": {
-      "$ref": "User.json"
+    "raw_data_size": {
+      "type": "integer",
+      "title": "Raw Data Size"
     },
     "raw_data_hash": {
       "$ref": "Fingerprint.json"
     },
-    "policy": {
-      "$ref": "Policy.json"
+    "enrichments": {
+      "type": "array",
+      "description": "",
+      "items": {
+        "$ref": "Enrichment.json"
+      }
     }
   }
 }
\ No newline at end of file
diff --git a/components/camel-ocsf/src/main/resources/schema/Actor.json b/components/camel-ocsf/src/main/resources/schema/Actor.json
index 3015eae55ba0..a94f8386b103 100644
--- a/components/camel-ocsf/src/main/resources/schema/Actor.json
+++ b/components/camel-ocsf/src/main/resources/schema/Actor.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/actor",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/actor",
   "title": "Actor",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.Actor",
diff --git a/components/camel-ocsf/src/main/resources/schema/Agent.json b/components/camel-ocsf/src/main/resources/schema/Agent.json
index 73e07c321d09..366f9627d985 100644
--- a/components/camel-ocsf/src/main/resources/schema/Agent.json
+++ b/components/camel-ocsf/src/main/resources/schema/Agent.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/agent",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/agent",
   "title": "Agent",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.Agent",
diff --git a/components/camel-ocsf/src/main/resources/schema/Analytic.json b/components/camel-ocsf/src/main/resources/schema/Analytic.json
index 747d7fd3a3e4..c12f9858f128 100644
--- a/components/camel-ocsf/src/main/resources/schema/Analytic.json
+++ b/components/camel-ocsf/src/main/resources/schema/Analytic.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/analytic",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/analytic",
   "title": "Analytic",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.Analytic",
diff --git a/components/camel-ocsf/src/main/resources/schema/Api.json b/components/camel-ocsf/src/main/resources/schema/Api.json
index 7bfd5daa2734..b4ee1ddc2e01 100644
--- a/components/camel-ocsf/src/main/resources/schema/Api.json
+++ b/components/camel-ocsf/src/main/resources/schema/Api.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/api",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/api",
   "title": "Api",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.Api",
@@ -25,6 +25,9 @@
     "operation": {
       "type": "string",
       "title": "Operation"
+    },
+    "token": {
+      "$ref": "Token.json"
     }
   },
   "description": "The API object."
diff --git a/components/camel-ocsf/src/main/resources/schema/ApiActivity.json b/components/camel-ocsf/src/main/resources/schema/ApiActivity.json
index b38336aa2a65..ae77288ad598 100644
--- a/components/camel-ocsf/src/main/resources/schema/ApiActivity.json
+++ b/components/camel-ocsf/src/main/resources/schema/ApiActivity.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/classes/api_activity",
+  "$id": "https://schema.ocsf.io/1.8.0/classes/api_activity",
   "title": "ApiActivity",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.ApiActivity",
@@ -9,9 +9,18 @@
     "$ref": "OcsfEvent.json"
   },
   "properties": {
+    "src_endpoint": {
+      "$ref": "NetworkEndpoint.json"
+    },
+    "http_response": {
+      "$ref": "HttpResponse.json"
+    },
     "actor": {
       "$ref": "Actor.json"
     },
+    "dst_endpoint": {
+      "$ref": "NetworkEndpoint.json"
+    },
     "resources": {
       "type": "array",
       "description": "",
@@ -19,12 +28,18 @@
         "$ref": "ResourceDetails.json"
       }
     },
+    "http_request": {
+      "$ref": "HttpRequest.json"
+    },
+    "api": {
+      "$ref": "Api.json"
+    },
     "raw_data_size": {
       "type": "integer",
       "title": "Raw Data Size"
     },
-    "http_response": {
-      "$ref": "HttpResponse.json"
+    "raw_data_hash": {
+      "$ref": "Fingerprint.json"
     },
     "enrichments": {
       "type": "array",
@@ -32,21 +47,6 @@
       "items": {
         "$ref": "Enrichment.json"
       }
-    },
-    "http_request": {
-      "$ref": "HttpRequest.json"
-    },
-    "api": {
-      "$ref": "Api.json"
-    },
-    "src_endpoint": {
-      "$ref": "NetworkEndpoint.json"
-    },
-    "dst_endpoint": {
-      "$ref": "NetworkEndpoint.json"
-    },
-    "raw_data_hash": {
-      "$ref": "Fingerprint.json"
     }
   }
 }
\ No newline at end of file
diff --git a/components/camel-ocsf/src/main/resources/schema/Attack.json b/components/camel-ocsf/src/main/resources/schema/Attack.json
index 08e4c8a9b755..cb2b2b0ad2f5 100644
--- a/components/camel-ocsf/src/main/resources/schema/Attack.json
+++ b/components/camel-ocsf/src/main/resources/schema/Attack.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/attack",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/attack",
   "title": "Attack",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.Attack",
diff --git a/components/camel-ocsf/src/main/resources/schema/AuthFactor.json b/components/camel-ocsf/src/main/resources/schema/AuthFactor.json
index be09be009e2f..95f227a4348e 100644
--- a/components/camel-ocsf/src/main/resources/schema/AuthFactor.json
+++ b/components/camel-ocsf/src/main/resources/schema/AuthFactor.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/auth_factor",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/auth_factor",
   "title": "AuthFactor",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.AuthFactor",
diff --git a/components/camel-ocsf/src/main/resources/schema/Authentication.json b/components/camel-ocsf/src/main/resources/schema/Authentication.json
index 02ba1864e80d..acad7e2acaf5 100644
--- a/components/camel-ocsf/src/main/resources/schema/Authentication.json
+++ b/components/camel-ocsf/src/main/resources/schema/Authentication.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/classes/authentication",
+  "$id": "https://schema.ocsf.io/1.8.0/classes/authentication",
   "title": "Authentication",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.Authentication",
@@ -9,100 +9,100 @@
     "$ref": "OcsfEvent.json"
   },
   "properties": {
-    "account_switch_type_id": {
-      "type": "integer",
-      "title": "Account Switch Type ID"
-    },
-    "actor": {
-      "$ref": "Actor.json"
-    },
-    "service": {
-      "$ref": "Service.json"
+    "src_endpoint": {
+      "$ref": "NetworkEndpoint.json"
     },
-    "auth_protocol_id": {
-      "type": "integer",
-      "title": "Auth Protocol ID"
+    "is_new_logon": {
+      "type": "boolean",
+      "title": "New Logon"
     },
-    "raw_data_size": {
-      "type": "integer",
-      "title": "Raw Data Size"
+    "certificate": {
+      "$ref": "Certificate.json"
     },
     "http_response": {
       "$ref": "HttpResponse.json"
     },
-    "enrichments": {
-      "type": "array",
-      "description": "",
-      "items": {
-        "$ref": "Enrichment.json"
-      }
+    "user": {
+      "$ref": "User.json"
+    },
+    "auth_protocol": {
+      "type": "string",
+      "title": "Auth Protocol"
     },
     "logon_process": {
       "$ref": "Process.json"
     },
-    "http_request": {
-      "$ref": "HttpRequest.json"
-    },
-    "src_endpoint": {
-      "$ref": "NetworkEndpoint.json"
-    },
     "is_mfa": {
       "type": "boolean",
       "title": "Multi Factor Authentication"
     },
-    "user": {
-      "$ref": "User.json"
+    "actor": {
+      "$ref": "Actor.json"
     },
-    "session": {
-      "$ref": "Session.json"
+    "authentication_token": {
+      "type": "object",
+      "additionalProperties": true
     },
-    "auth_factors": {
-      "type": "array",
-      "description": "",
-      "items": {
-        "$ref": "AuthFactor.json"
-      }
+    "dst_endpoint": {
+      "$ref": "NetworkEndpoint.json"
+    },
+    "account_switch_type_id": {
+      "type": "integer",
+      "title": "Account Switch Type ID"
+    },
+    "service": {
+      "$ref": "Service.json"
+    },
+    "is_cleartext": {
+      "type": "boolean",
+      "title": "Cleartext Credentials"
     },
     "logon_type": {
       "type": "string",
       "title": "Logon Type"
     },
-    "dst_endpoint": {
-      "$ref": "NetworkEndpoint.json"
-    },
-    "certificate": {
-      "$ref": "Certificate.json"
-    },
-    "raw_data_hash": {
-      "$ref": "Fingerprint.json"
+    "account_switch_type": {
+      "type": "string",
+      "title": "Account Switch Type"
     },
     "logon_type_id": {
       "type": "integer",
       "title": "Logon Type ID"
     },
+    "auth_protocol_id": {
+      "type": "integer",
+      "title": "Auth Protocol ID"
+    },
+    "http_request": {
+      "$ref": "HttpRequest.json"
+    },
     "is_remote": {
       "type": "boolean",
       "title": "Remote"
     },
-    "is_new_logon": {
-      "type": "boolean",
-      "title": "New Logon"
+    "auth_factors": {
+      "type": "array",
+      "description": "",
+      "items": {
+        "$ref": "AuthFactor.json"
+      }
     },
-    "authentication_token": {
-      "type": "object",
-      "additionalProperties": true
+    "session": {
+      "$ref": "Session.json"
     },
-    "auth_protocol": {
-      "type": "string",
-      "title": "Auth Protocol"
+    "raw_data_size": {
+      "type": "integer",
+      "title": "Raw Data Size"
     },
-    "account_switch_type": {
-      "type": "string",
-      "title": "Account Switch Type"
+    "raw_data_hash": {
+      "$ref": "Fingerprint.json"
     },
-    "is_cleartext": {
-      "type": "boolean",
-      "title": "Cleartext Credentials"
+    "enrichments": {
+      "type": "array",
+      "description": "",
+      "items": {
+        "$ref": "Enrichment.json"
+      }
     }
   }
 }
\ No newline at end of file
diff --git a/components/camel-ocsf/src/main/resources/schema/Authorization.json b/components/camel-ocsf/src/main/resources/schema/Authorization.json
index 28737d7bedd4..2c10a838af30 100644
--- a/components/camel-ocsf/src/main/resources/schema/Authorization.json
+++ b/components/camel-ocsf/src/main/resources/schema/Authorization.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/authorization",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/authorization",
   "title": "Authorization",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.Authorization",
diff --git a/components/camel-ocsf/src/main/resources/schema/AuthorizeSession.json b/components/camel-ocsf/src/main/resources/schema/AuthorizeSession.json
index 2cbad2bc4713..2a79f16387c9 100644
--- a/components/camel-ocsf/src/main/resources/schema/AuthorizeSession.json
+++ b/components/camel-ocsf/src/main/resources/schema/AuthorizeSession.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/classes/authorize_session",
+  "$id": "https://schema.ocsf.io/1.8.0/classes/authorize_session",
   "title": "AuthorizeSession",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.AuthorizeSession",
@@ -9,50 +9,50 @@
     "$ref": "OcsfEvent.json"
   },
   "properties": {
-    "privileges": {
-      "type": "array",
-      "title": "Privileges",
-      "items": {
-        "type": "string"
-      }
+    "src_endpoint": {
+      "$ref": "NetworkEndpoint.json"
+    },
+    "http_response": {
+      "$ref": "HttpResponse.json"
+    },
+    "user": {
+      "$ref": "User.json"
     },
     "actor": {
       "$ref": "Actor.json"
     },
-    "raw_data_size": {
-      "type": "integer",
-      "title": "Raw Data Size"
+    "group": {
+      "$ref": "Group.json"
     },
-    "http_response": {
-      "$ref": "HttpResponse.json"
+    "dst_endpoint": {
+      "$ref": "NetworkEndpoint.json"
     },
-    "enrichments": {
+    "privileges": {
       "type": "array",
-      "description": "",
+      "title": "Privileges",
       "items": {
-        "$ref": "Enrichment.json"
+        "type": "string"
       }
     },
     "http_request": {
       "$ref": "HttpRequest.json"
     },
-    "src_endpoint": {
-      "$ref": "NetworkEndpoint.json"
-    },
-    "group": {
-      "$ref": "Group.json"
-    },
-    "user": {
-      "$ref": "User.json"
-    },
     "session": {
       "$ref": "Session.json"
     },
-    "dst_endpoint": {
-      "$ref": "NetworkEndpoint.json"
+    "raw_data_size": {
+      "type": "integer",
+      "title": "Raw Data Size"
     },
     "raw_data_hash": {
       "$ref": "Fingerprint.json"
+    },
+    "enrichments": {
+      "type": "array",
+      "description": "",
+      "items": {
+        "$ref": "Enrichment.json"
+      }
     }
   }
 }
\ No newline at end of file
diff --git a/components/camel-ocsf/src/main/resources/schema/Certificate.json b/components/camel-ocsf/src/main/resources/schema/Certificate.json
index 632bc4661dff..117a90ae6419 100644
--- a/components/camel-ocsf/src/main/resources/schema/Certificate.json
+++ b/components/camel-ocsf/src/main/resources/schema/Certificate.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/certificate",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/certificate",
   "title": "Certificate",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.Certificate",
@@ -14,6 +14,10 @@
       "type": "string",
       "title": "Unique ID"
     },
+    "issuer": {
+      "type": "string",
+      "title": "Issuer Distinguished Name"
+    },
     "is_self_signed": {
       "type": "boolean",
       "title": "Certificate Self-Signed"
@@ -22,10 +26,6 @@
       "type": "string",
       "title": "Subject Distinguished Name"
     },
-    "issuer": {
-      "type": "string",
-      "title": "Issuer Distinguished Name"
-    },
     "fingerprints": {
       "type": "array",
       "title": "Fingerprints",
diff --git a/components/camel-ocsf/src/main/resources/schema/Cloud.json b/components/camel-ocsf/src/main/resources/schema/Cloud.json
index 3cbbca66517b..20a59ffe40e1 100644
--- a/components/camel-ocsf/src/main/resources/schema/Cloud.json
+++ b/components/camel-ocsf/src/main/resources/schema/Cloud.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/cloud",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/cloud",
   "title": "Cloud",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.Cloud",
@@ -22,7 +22,7 @@
     },
     "provider": {
       "type": "string",
-      "title": "Provider"
+      "title": "Cloud Provider"
     },
     "region": {
       "type": "string",
diff --git a/components/camel-ocsf/src/main/resources/schema/Compliance.json b/components/camel-ocsf/src/main/resources/schema/Compliance.json
index 404b6060651f..c8c252e5b8e7 100644
--- a/components/camel-ocsf/src/main/resources/schema/Compliance.json
+++ b/components/camel-ocsf/src/main/resources/schema/Compliance.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/compliance",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/compliance",
   "title": "Compliance",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.Compliance",
diff --git a/components/camel-ocsf/src/main/resources/schema/ComplianceFinding.json b/components/camel-ocsf/src/main/resources/schema/ComplianceFinding.json
index 808279866831..8d06181cd765 100644
--- a/components/camel-ocsf/src/main/resources/schema/ComplianceFinding.json
+++ b/components/camel-ocsf/src/main/resources/schema/ComplianceFinding.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/classes/compliance_finding",
+  "$id": "https://schema.ocsf.io/1.8.0/classes/compliance_finding",
   "title": "ComplianceFinding",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.ComplianceFinding",
@@ -9,6 +9,20 @@
     "$ref": "OcsfEvent.json"
   },
   "properties": {
+    "compliance": {
+      "$ref": "Compliance.json"
+    },
+    "comment": {
+      "type": "string",
+      "title": "Comment"
+    },
+    "device": {
+      "$ref": "Device.json"
+    },
+    "confidence": {
+      "type": "string",
+      "title": "Confidence"
+    },
     "resources": {
       "type": "array",
       "description": "",
@@ -16,15 +30,19 @@
         "$ref": "ResourceDetails.json"
       }
     },
-    "raw_data_size": {
+    "confidence_id": {
       "type": "integer",
-      "title": "Raw Data Size"
+      "title": "Confidence ID"
     },
-    "finding_info": {
-      "$ref": "FindingInfo.json"
+    "confidence_score": {
+      "type": "integer",
+      "title": "Confidence Score"
     },
-    "device": {
-      "$ref": "Device.json"
+    "remediation": {
+      "$ref": "Remediation.json"
+    },
+    "vendor_attributes": {
+      "$ref": "VendorAttributes.json"
     },
     "evidences": {
       "type": "array",
@@ -34,43 +52,25 @@
         "additionalProperties": true
       }
     },
-    "enrichments": {
-      "type": "array",
-      "description": "",
-      "items": {
-        "$ref": "Enrichment.json"
-      }
-    },
-    "confidence_score": {
-      "type": "integer",
-      "title": "Confidence Score"
-    },
-    "confidence_id": {
-      "type": "integer",
-      "title": "Confidence ID"
-    },
-    "comment": {
-      "type": "string",
-      "title": "Comment"
-    },
-    "remediation": {
-      "$ref": "Remediation.json"
+    "finding_info": {
+      "$ref": "FindingInfo.json"
     },
     "resource": {
       "$ref": "ResourceDetails.json"
     },
-    "vendor_attributes": {
-      "$ref": "VendorAttributes.json"
-    },
-    "compliance": {
-      "$ref": "Compliance.json"
+    "raw_data_size": {
+      "type": "integer",
+      "title": "Raw Data Size"
     },
     "raw_data_hash": {
       "$ref": "Fingerprint.json"
     },
-    "confidence": {
-      "type": "string",
-      "title": "Confidence"
+    "enrichments": {
+      "type": "array",
+      "description": "",
+      "items": {
+        "$ref": "Enrichment.json"
+      }
     }
   }
 }
\ No newline at end of file
diff --git a/components/camel-ocsf/src/main/resources/schema/Container.json b/components/camel-ocsf/src/main/resources/schema/Container.json
index 93a2b8307af3..46c1f1af0491 100644
--- a/components/camel-ocsf/src/main/resources/schema/Container.json
+++ b/components/camel-ocsf/src/main/resources/schema/Container.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/container",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/container",
   "title": "Container",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.Container",
diff --git a/components/camel-ocsf/src/main/resources/schema/Cve.json b/components/camel-ocsf/src/main/resources/schema/Cve.json
index 3a5e77aeb0fc..eae9cbf7908e 100644
--- a/components/camel-ocsf/src/main/resources/schema/Cve.json
+++ b/components/camel-ocsf/src/main/resources/schema/Cve.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/cve",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/cve",
   "title": "Cve",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.Cve",
diff --git a/components/camel-ocsf/src/main/resources/schema/Cvss.json b/components/camel-ocsf/src/main/resources/schema/Cvss.json
index 489ddd9aea3b..7d9cfd491909 100644
--- a/components/camel-ocsf/src/main/resources/schema/Cvss.json
+++ b/components/camel-ocsf/src/main/resources/schema/Cvss.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/cvss",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/cvss",
   "title": "Cvss",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.Cvss",
diff --git a/components/camel-ocsf/src/main/resources/schema/Cwe.json b/components/camel-ocsf/src/main/resources/schema/Cwe.json
index c601acb1762d..0b5350e69a8e 100644
--- a/components/camel-ocsf/src/main/resources/schema/Cwe.json
+++ b/components/camel-ocsf/src/main/resources/schema/Cwe.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/cwe",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/cwe",
   "title": "Cwe",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.Cwe",
diff --git a/components/camel-ocsf/src/main/resources/schema/DatastoreActivity.json b/components/camel-ocsf/src/main/resources/schema/DatastoreActivity.json
index 2df5bcb0b02f..206afeb8ad45 100644
--- a/components/camel-ocsf/src/main/resources/schema/DatastoreActivity.json
+++ b/components/camel-ocsf/src/main/resources/schema/DatastoreActivity.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/classes/datastore_activity",
+  "$id": "https://schema.ocsf.io/1.8.0/classes/datastore_activity",
   "title": "DatastoreActivity",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.DatastoreActivity",
@@ -9,30 +9,31 @@
     "$ref": "OcsfEvent.json"
   },
   "properties": {
-    "actor": {
-      "$ref": "Actor.json"
+    "databucket": {
+      "type": "object",
+      "additionalProperties": true
     },
-    "raw_data_size": {
-      "type": "integer",
-      "title": "Raw Data Size"
+    "database": {
+      "type": "object",
+      "additionalProperties": true
+    },
+    "src_endpoint": {
+      "$ref": "NetworkEndpoint.json"
     },
     "http_response": {
       "$ref": "HttpResponse.json"
     },
-    "enrichments": {
-      "type": "array",
-      "description": "",
-      "items": {
-        "$ref": "Enrichment.json"
-      }
+    "type": {
+      "type": "string",
+      "title": "Datastore Type"
     },
-    "http_request": {
-      "$ref": "HttpRequest.json"
+    "actor": {
+      "$ref": "Actor.json"
     },
-    "src_endpoint": {
+    "dst_endpoint": {
       "$ref": "NetworkEndpoint.json"
     },
-    "databucket": {
+    "table": {
       "type": "object",
       "additionalProperties": true
     },
@@ -40,27 +41,26 @@
       "type": "integer",
       "title": "Datastore Type ID"
     },
-    "dst_endpoint": {
-      "$ref": "NetworkEndpoint.json"
-    },
-    "raw_data_hash": {
-      "$ref": "Fingerprint.json"
-    },
-    "database": {
-      "type": "object",
-      "additionalProperties": true
+    "http_request": {
+      "$ref": "HttpRequest.json"
     },
     "query_info": {
       "type": "object",
       "additionalProperties": true
     },
-    "type": {
-      "type": "string",
-      "title": "Datastore Type"
+    "raw_data_size": {
+      "type": "integer",
+      "title": "Raw Data Size"
     },
-    "table": {
-      "type": "object",
-      "additionalProperties": true
+    "raw_data_hash": {
+      "$ref": "Fingerprint.json"
+    },
+    "enrichments": {
+      "type": "array",
+      "description": "",
+      "items": {
+        "$ref": "Enrichment.json"
+      }
     }
   }
 }
\ No newline at end of file
diff --git a/components/camel-ocsf/src/main/resources/schema/DetectionFinding.json b/components/camel-ocsf/src/main/resources/schema/DetectionFinding.json
index 3b8a7f5aa90f..f13f527fdffe 100644
--- a/components/camel-ocsf/src/main/resources/schema/DetectionFinding.json
+++ b/components/camel-ocsf/src/main/resources/schema/DetectionFinding.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/classes/detection_finding",
+  "$id": "https://schema.ocsf.io/1.8.0/classes/detection_finding",
   "title": "DetectionFinding",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.DetectionFinding",
@@ -9,120 +9,120 @@
     "$ref": "OcsfEvent.json"
   },
   "properties": {
-    "impact": {
-      "type": "string",
-      "title": "Impact"
+    "impact_id": {
+      "type": "integer",
+      "title": "Impact ID"
     },
-    "resources": {
+    "anomaly_analyses": {
       "type": "array",
-      "description": "",
+      "title": "Anomaly Analyses",
       "items": {
-        "$ref": "ResourceDetails.json"
+        "type": "object",
+        "additionalProperties": true
       }
     },
-    "raw_data_size": {
+    "impact_score": {
       "type": "integer",
-      "title": "Raw Data Size"
+      "title": "Impact Score"
+    },
+    "risk_level": {
+      "type": "string",
+      "title": "Risk Level"
+    },
+    "vulnerabilities": {
+      "type": "array",
+      "description": "",
+      "items": {
+        "$ref": "Vulnerability.json"
+      }
     },
     "risk_score": {
       "type": "integer",
       "title": "Risk Score"
     },
-    "finding_info": {
-      "$ref": "FindingInfo.json"
-    },
-    "malware_scan_info": {
-      "type": "object",
-      "additionalProperties": true
+    "comment": {
+      "type": "string",
+      "title": "Comment"
     },
     "device": {
       "$ref": "Device.json"
     },
-    "evidences": {
-      "type": "array",
-      "title": "Evidence Artifacts",
-      "items": {
-        "type": "object",
-        "additionalProperties": true
-      }
+    "confidence": {
+      "type": "string",
+      "title": "Confidence"
     },
-    "enrichments": {
-      "type": "array",
-      "description": "",
-      "items": {
-        "$ref": "Enrichment.json"
-      }
+    "is_alert": {
+      "type": "boolean",
+      "title": "Alert"
     },
-    "confidence_score": {
+    "risk_level_id": {
       "type": "integer",
-      "title": "Confidence Score"
+      "title": "Risk Level ID"
     },
-    "impact_id": {
-      "type": "integer",
-      "title": "Impact ID"
+    "malware_scan_info": {
+      "type": "object",
+      "additionalProperties": true
     },
-    "malware": {
+    "resources": {
       "type": "array",
       "description": "",
       "items": {
-        "$ref": "Malware.json"
+        "$ref": "ResourceDetails.json"
       }
     },
     "confidence_id": {
       "type": "integer",
       "title": "Confidence ID"
     },
-    "comment": {
-      "type": "string",
-      "title": "Comment"
-    },
-    "is_alert": {
-      "type": "boolean",
-      "title": "Alert"
+    "confidence_score": {
+      "type": "integer",
+      "title": "Confidence Score"
     },
     "remediation": {
       "$ref": "Remediation.json"
     },
-    "risk_details": {
+    "vendor_attributes": {
+      "$ref": "VendorAttributes.json"
+    },
+    "impact": {
       "type": "string",
-      "title": "Risk Details"
+      "title": "Impact"
     },
-    "vulnerabilities": {
+    "malware": {
       "type": "array",
       "description": "",
       "items": {
-        "$ref": "Vulnerability.json"
+        "$ref": "Malware.json"
       }
     },
-    "vendor_attributes": {
-      "$ref": "VendorAttributes.json"
+    "evidences": {
+      "type": "array",
+      "title": "Evidence Artifacts",
+      "items": {
+        "type": "object",
+        "additionalProperties": true
+      }
     },
-    "risk_level_id": {
-      "type": "integer",
-      "title": "Risk Level ID"
+    "finding_info": {
+      "$ref": "FindingInfo.json"
     },
-    "raw_data_hash": {
-      "$ref": "Fingerprint.json"
+    "risk_details": {
+      "type": "string",
+      "title": "Risk Details"
     },
-    "impact_score": {
+    "raw_data_size": {
       "type": "integer",
-      "title": "Impact Score"
+      "title": "Raw Data Size"
     },
-    "confidence": {
-      "type": "string",
-      "title": "Confidence"
+    "raw_data_hash": {
+      "$ref": "Fingerprint.json"
     },
-    "anomaly_analyses": {
+    "enrichments": {
       "type": "array",
-      "title": "Anomaly Analyses",
+      "description": "",
       "items": {
-        "type": "object",
-        "additionalProperties": true
+        "$ref": "Enrichment.json"
       }
-    },
-    "risk_level": {
-      "type": "string",
-      "title": "Risk Level"
     }
   }
 }
\ No newline at end of file
diff --git a/components/camel-ocsf/src/main/resources/schema/Device.json b/components/camel-ocsf/src/main/resources/schema/Device.json
index 613b2e551efa..2ac9f227dc7b 100644
--- a/components/camel-ocsf/src/main/resources/schema/Device.json
+++ b/components/camel-ocsf/src/main/resources/schema/Device.json
@@ -1,36 +1,42 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/device",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/device",
   "title": "Device",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.Device",
   "additionalProperties": true,
   "properties": {
-    "uid": {
+    "model": {
       "type": "string",
-      "title": "Unique ID"
+      "title": "Model"
     },
-    "desc": {
+    "os": {
+      "$ref": "Os.json"
+    },
+    "zone": {
       "type": "string",
-      "title": "Description"
+      "title": "Network Zone"
     },
-    "is_backed_up": {
-      "type": "boolean",
-      "title": "Back Ups Configured"
+    "subnet_uid": {
+      "type": "string",
+      "title": "Subnet UID"
     },
-    "is_managed": {
-      "type": "boolean",
-      "title": "Managed Device"
+    "groups": {
+      "type": "array",
+      "title": "Groups",
+      "items": {
+        "$ref": "Group.json"
+      }
     },
     "location": {
       "$ref": "Location.json"
     },
-    "org": {
-      "$ref": "Organization.json"
+    "owner": {
+      "$ref": "User.json"
     },
-    "risk_score": {
-      "type": "integer",
-      "title": "Risk Score"
+    "type": {
+      "type": "string",
+      "title": "Type"
     },
     "interface_name": {
       "type": "string",
@@ -40,118 +46,121 @@
       "type": "string",
       "title": "Hypervisor"
     },
-    "eid": {
-      "type": "string",
-      "title": "EID"
-    },
-    "image": {
-      "$ref": "Image.json"
-    },
-    "zone": {
+    "interface_uid": {
       "type": "string",
-      "title": "Network Zone"
+      "title": "Network Interface ID"
     },
-    "subnet_uid": {
+    "os_machine_uuid": {
       "type": "string",
-      "title": "Subnet UID"
+      "title": "OS Machine UUID",
+      "pattern": "[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}"
     },
-    "iccid": {
+    "domain": {
       "type": "string",
-      "title": "ICCID"
+      "title": "Domain"
     },
-    "mac": {
+    "risk_level": {
       "type": "string",
-      "title": "MAC Address",
-      "pattern": "^([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})$"
-    },
-    "created_time": {
-      "type": "integer",
-      "existingJavaType": "java.lang.Long",
-      "title": "Created Time"
+      "title": "Risk Level"
     },
-    "network_interfaces": {
-      "type": "array",
-      "description": "",
-      "items": {
-        "$ref": "NetworkInterface.json"
-      }
+    "hw_info": {
+      "type": "object",
+      "additionalProperties": true
     },
-    "model": {
-      "type": "string",
-      "title": "Model"
+    "is_backed_up": {
+      "type": "boolean",
+      "title": "Back Ups Configured"
     },
-    "owner": {
-      "$ref": "User.json"
+    "pool": {
+      "$ref": "Group.json"
     },
-    "os_machine_uuid": {
+    "boot_uid": {
       "type": "string",
-      "title": "OS Machine UUID",
-      "pattern": "[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}"
+      "title": "Boot UID"
     },
-    "os": {
-      "$ref": "Os.json"
+    "is_personal": {
+      "type": "boolean",
+      "title": "Personal Device"
     },
-    "vlan_uid": {
-      "type": "string",
-      "title": "VLAN"
+    "risk_score": {
+      "type": "integer",
+      "title": "Risk Score"
     },
-    "meid": {
-      "type": "string",
-      "title": "MEID"
+    "modified_time": {
+      "type": "integer",
+      "existingJavaType": "java.lang.Long",
+      "title": "Modified Time"
     },
-    "vpc_uid": {
+    "name": {
       "type": "string",
-      "title": "VPC UID"
+      "title": "Name"
     },
-    "boot_time": {
-      "type": "integer",
-      "existingJavaType": "java.lang.Long",
-      "title": "Boot Time"
+    "is_supervised": {
+      "type": "boolean",
+      "title": "Supervised Device"
     },
     "is_compliant": {
       "type": "boolean",
       "title": "Compliant Device"
     },
-    "is_personal": {
+    "is_shared": {
       "type": "boolean",
-      "title": "Personal Device"
+      "title": "Shared Device"
     },
-    "ip": {
+    "org": {
+      "$ref": "Organization.json"
+    },
+    "imei": {
       "type": "string",
-      "title": "IP Address",
-      "pattern": "((^\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]).){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\s*$)|(^\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa- [...]
+      "title": "IMEI"
     },
-    "is_supervised": {
+    "meid": {
+      "type": "string",
+      "title": "MEID"
+    },
+    "is_managed": {
       "type": "boolean",
-      "title": "Supervised Device"
+      "title": "Managed Device"
     },
-    "first_seen_time": {
+    "subnet": {
+      "type": "string",
+      "title": "Subnet"
+    },
+    "network_interfaces": {
+      "type": "array",
+      "description": "",
+      "items": {
+        "$ref": "NetworkInterface.json"
+      }
+    },
+    "risk_level_id": {
       "type": "integer",
-      "existingJavaType": "java.lang.Long",
-      "title": "First Seen"
+      "title": "Risk Level ID"
     },
-    "uid_alt": {
+    "is_mobile_account_active": {
+      "type": "boolean",
+      "title": "Mobile Account Active"
+    },
+    "vendor_name": {
       "type": "string",
-      "title": "Alternate ID"
+      "title": "Vendor Name"
     },
-    "type_id": {
-      "type": "integer",
-      "title": "Type ID"
+    "iccid": {
+      "type": "string",
+      "title": "ICCID"
     },
-    "imei": {
+    "vpc_uid": {
       "type": "string",
-      "title": "IMEI"
+      "title": "VPC UID"
     },
-    "autoscale_uid": {
+    "region": {
       "type": "string",
-      "title": "Autoscale UID"
+      "title": "Region"
     },
-    "groups": {
-      "type": "array",
-      "title": "Groups",
-      "items": {
-        "$ref": "Group.json"
-      }
+    "boot_time": {
+      "type": "integer",
+      "existingJavaType": "java.lang.Long",
+      "title": "Boot Time"
     },
     "agent_list": {
       "type": "array",
@@ -160,71 +169,52 @@
         "$ref": "Agent.json"
       }
     },
-    "hw_info": {
-      "type": "object",
-      "additionalProperties": true
-    },
-    "domain": {
-      "type": "string",
-      "title": "Domain"
-    },
-    "instance_uid": {
+    "vlan_uid": {
       "type": "string",
-      "title": "Instance ID"
+      "title": "VLAN"
     },
-    "subnet": {
+    "desc": {
       "type": "string",
-      "title": "Subnet"
+      "title": "Description"
     },
-    "is_mobile_account_active": {
-      "type": "boolean",
-      "title": "Mobile Account Active"
+    "image": {
+      "$ref": "Image.json"
     },
-    "risk_level_id": {
+    "type_id": {
       "type": "integer",
-      "title": "Risk Level ID"
+      "title": "Type ID"
     },
-    "modified_time": {
+    "first_seen_time": {
       "type": "integer",
       "existingJavaType": "java.lang.Long",
-      "title": "Modified Time"
+      "title": "First Seen"
     },
     "last_seen_time": {
       "type": "integer",
       "existingJavaType": "java.lang.Long",
       "title": "Last Seen"
     },
-    "udid": {
-      "type": "string",
-      "title": "Unique Device Identifier"
-    },
-    "region": {
-      "type": "string",
-      "title": "Region"
-    },
-    "name": {
+    "eid": {
       "type": "string",
-      "title": "Name"
+      "title": "EID"
     },
-    "boot_uid": {
+    "hostname": {
       "type": "string",
-      "title": "Boot UID"
-    },
-    "is_shared": {
-      "type": "boolean",
-      "title": "Shared Device"
+      "title": "Hostname"
     },
     "is_trusted": {
       "type": "boolean",
       "title": "Trusted Device"
     },
-    "interface_uid": {
-      "type": "string",
-      "title": "Network Interface ID"
+    "created_time": {
+      "type": "integer",
+      "existingJavaType": "java.lang.Long",
+      "title": "Created Time"
     },
-    "type": {
+    "mac": {
       "type": "string",
-      "title": "Type"
+      "title": "MAC Address",
+      "pattern": "^([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})$"
     },
     "imei_list": {
       "type": "array",
@@ -233,17 +223,34 @@
         "type": "string"
       }
     },
-    "vendor_name": {
+    "autoscale_uid": {
       "type": "string",
-      "title": "Vendor Name"
+      "title": "Autoscale UID"
     },
-    "risk_level": {
+    "uid_alt": {
       "type": "string",
-      "title": "Risk Level"
+      "title": "Alternate ID"
     },
-    "hostname": {
+    "instance_uid": {
       "type": "string",
-      "title": "Hostname"
+      "title": "Instance ID"
+    },
+    "uid": {
+      "type": "string",
+      "title": "Unique ID"
+    },
+    "ip": {
+      "type": "string",
+      "title": "IP Address",
+      "pattern": "((^\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]).){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\s*$)|(^\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa- [...]
+    },
+    "mac_vendor": {
+      "type": "string",
+      "title": "MAC Vendor"
+    },
+    "udid": {
+      "type": "string",
+      "title": "Unique Device Identifier"
     }
   },
   "description": "The Device object."
diff --git a/components/camel-ocsf/src/main/resources/schema/DhcpActivity.json b/components/camel-ocsf/src/main/resources/schema/DhcpActivity.json
index 5274635e7f16..48fb6f446958 100644
--- a/components/camel-ocsf/src/main/resources/schema/DhcpActivity.json
+++ b/components/camel-ocsf/src/main/resources/schema/DhcpActivity.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/classes/dhcp_activity",
+  "$id": "https://schema.ocsf.io/1.8.0/classes/dhcp_activity",
   "title": "DhcpActivity",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.DhcpActivity",
@@ -9,63 +9,70 @@
     "$ref": "OcsfEvent.json"
   },
   "properties": {
-    "cumulative_traffic": {
-      "type": "object",
-      "additionalProperties": true
+    "transaction_uid": {
+      "type": "string",
+      "title": "Transaction UID"
     },
-    "connection_info": {
-      "type": "object",
-      "additionalProperties": true
+    "ja4_fingerprint_list": {
+      "type": "array",
+      "title": "JA4+ Fingerprints",
+      "items": {
+        "$ref": "Ja4Fingerprint.json"
+      }
     },
-    "raw_data_size": {
+    "observation_point": {
+      "type": "string",
+      "title": "Observation Point"
+    },
+    "src_endpoint": {
+      "$ref": "NetworkEndpoint.json"
+    },
+    "lease_dur": {
       "type": "integer",
-      "title": "Raw Data Size"
+      "title": "Lease Duration"
     },
-    "relay": {
-      "$ref": "NetworkInterface.json"
+    "tls": {
+      "$ref": "Tls.json"
     },
-    "enrichments": {
+    "cumulative_traffic": {
+      "type": "object",
+      "additionalProperties": true
+    },
+    "dst_endpoint": {
+      "$ref": "NetworkEndpoint.json"
+    },
+    "packet_list": {
       "type": "array",
       "description": "",
       "items": {
-        "$ref": "Enrichment.json"
+        "$ref": "Packet.json"
       }
     },
-    "traffic": {
+    "connection_info": {
       "type": "object",
       "additionalProperties": true
     },
-    "src_endpoint": {
-      "$ref": "NetworkEndpoint.json"
-    },
     "app_name": {
       "type": "string",
       "title": "Application Name"
     },
-    "transaction_uid": {
-      "type": "string",
-      "title": "Transaction UID"
+    "traffic": {
+      "type": "object",
+      "additionalProperties": true
     },
     "is_renewal": {
       "type": "boolean",
       "title": "Renewal"
     },
-    "lease_dur": {
-      "type": "integer",
-      "title": "Lease Duration"
-    },
-    "dst_endpoint": {
+    "network_observation_point": {
       "$ref": "NetworkEndpoint.json"
     },
-    "raw_data_hash": {
-      "$ref": "Fingerprint.json"
+    "relay": {
+      "$ref": "NetworkInterface.json"
     },
-    "ja4_fingerprint_list": {
-      "type": "array",
-      "title": "JA4+ Fingerprints",
-      "items": {
-        "$ref": "Ja4Fingerprint.json"
-      }
+    "app_protocol_name": {
+      "type": "string",
+      "title": "Application Protocol Name"
     },
     "observation_point_id": {
       "type": "integer",
@@ -75,12 +82,19 @@
       "type": "object",
       "additionalProperties": true
     },
-    "observation_point": {
-      "type": "string",
-      "title": "Observation Point"
+    "raw_data_size": {
+      "type": "integer",
+      "title": "Raw Data Size"
     },
-    "tls": {
-      "$ref": "Tls.json"
+    "raw_data_hash": {
+      "$ref": "Fingerprint.json"
+    },
+    "enrichments": {
+      "type": "array",
+      "description": "",
+      "items": {
+        "$ref": "Enrichment.json"
+      }
     }
   }
 }
\ No newline at end of file
diff --git a/components/camel-ocsf/src/main/resources/schema/Display.json b/components/camel-ocsf/src/main/resources/schema/Display.json
index 0806e1450caa..64c2abaafdae 100644
--- a/components/camel-ocsf/src/main/resources/schema/Display.json
+++ b/components/camel-ocsf/src/main/resources/schema/Display.json
@@ -1,11 +1,15 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/display",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/display",
   "title": "Display",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.Display",
   "additionalProperties": true,
   "properties": {
+    "scale_factor": {
+      "type": "integer",
+      "title": "Scale Factor"
+    },
     "color_depth": {
       "type": "integer",
       "title": "Color Depth"
@@ -21,10 +25,6 @@
     "physical_width": {
       "type": "integer",
       "title": "Physical Width"
-    },
-    "scale_factor": {
-      "type": "integer",
-      "title": "Scale Factor"
     }
   },
   "description": "The Display object."
diff --git a/components/camel-ocsf/src/main/resources/schema/DnsActivity.json b/components/camel-ocsf/src/main/resources/schema/DnsActivity.json
index 49ab12fd8d38..48d6fc8d06bd 100644
--- a/components/camel-ocsf/src/main/resources/schema/DnsActivity.json
+++ b/components/camel-ocsf/src/main/resources/schema/DnsActivity.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/classes/dns_activity",
+  "$id": "https://schema.ocsf.io/1.8.0/classes/dns_activity",
   "title": "DnsActivity",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.DnsActivity",
@@ -9,52 +9,66 @@
     "$ref": "OcsfEvent.json"
   },
   "properties": {
-    "cumulative_traffic": {
-      "type": "object",
-      "additionalProperties": true
-    },
-    "connection_info": {
-      "type": "object",
-      "additionalProperties": true
+    "rcode": {
+      "type": "string",
+      "title": "Response Code"
     },
-    "raw_data_size": {
+    "query_time": {
       "type": "integer",
-      "title": "Raw Data Size"
+      "existingJavaType": "java.lang.Long",
+      "title": "Query Time"
     },
-    "enrichments": {
+    "ja4_fingerprint_list": {
       "type": "array",
-      "description": "",
+      "title": "JA4+ Fingerprints",
       "items": {
-        "$ref": "Enrichment.json"
+        "$ref": "Ja4Fingerprint.json"
       }
     },
-    "traffic": {
+    "observation_point": {
+      "type": "string",
+      "title": "Observation Point"
+    },
+    "src_endpoint": {
+      "$ref": "NetworkEndpoint.json"
+    },
+    "query": {
+      "$ref": "DnsQuery.json"
+    },
+    "tls": {
+      "$ref": "Tls.json"
+    },
+    "cumulative_traffic": {
       "type": "object",
       "additionalProperties": true
     },
+    "dst_endpoint": {
+      "$ref": "NetworkEndpoint.json"
+    },
     "rcode_id": {
       "type": "integer",
       "title": "Response Code ID"
     },
-    "answers": {
+    "packet_list": {
       "type": "array",
-      "title": "DNS Answer",
+      "description": "",
       "items": {
-        "type": "object",
-        "additionalProperties": true
+        "$ref": "Packet.json"
       }
     },
-    "src_endpoint": {
-      "$ref": "NetworkEndpoint.json"
+    "connection_info": {
+      "type": "object",
+      "additionalProperties": true
     },
     "app_name": {
       "type": "string",
       "title": "Application Name"
     },
-    "query": {
-      "$ref": "DnsQuery.json"
+    "traffic": {
+      "type": "object",
+      "additionalProperties": true
     },
-    "dst_endpoint": {
+    "network_observation_point": {
       "$ref": "NetworkEndpoint.json"
     },
     "response_time": {
@@ -62,39 +76,39 @@
       "existingJavaType": "java.lang.Long",
       "title": "Response Time"
     },
-    "rcode": {
+    "app_protocol_name": {
       "type": "string",
-      "title": "Response Code"
-    },
-    "raw_data_hash": {
-      "$ref": "Fingerprint.json"
+      "title": "Application Protocol Name"
     },
-    "ja4_fingerprint_list": {
+    "answers": {
       "type": "array",
-      "title": "JA4+ Fingerprints",
+      "title": "DNS Answer",
       "items": {
-        "$ref": "Ja4Fingerprint.json"
+        "type": "object",
+        "additionalProperties": true
       }
     },
     "observation_point_id": {
       "type": "integer",
       "title": "Observation Point ID"
     },
-    "query_time": {
-      "type": "integer",
-      "existingJavaType": "java.lang.Long",
-      "title": "Query Time"
-    },
     "proxy": {
       "type": "object",
       "additionalProperties": true
     },
-    "observation_point": {
-      "type": "string",
-      "title": "Observation Point"
+    "raw_data_size": {
+      "type": "integer",
+      "title": "Raw Data Size"
     },
-    "tls": {
-      "$ref": "Tls.json"
+    "raw_data_hash": {
+      "$ref": "Fingerprint.json"
+    },
+    "enrichments": {
+      "type": "array",
+      "description": "",
+      "items": {
+        "$ref": "Enrichment.json"
+      }
     }
   }
 }
\ No newline at end of file
diff --git a/components/camel-ocsf/src/main/resources/schema/DnsQuery.json b/components/camel-ocsf/src/main/resources/schema/DnsQuery.json
index 273a77d99efc..f4ad3e74c842 100644
--- a/components/camel-ocsf/src/main/resources/schema/DnsQuery.json
+++ b/components/camel-ocsf/src/main/resources/schema/DnsQuery.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/dns_query",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/dns_query",
   "title": "DnsQuery",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.DnsQuery",
@@ -10,10 +10,6 @@
       "type": "string",
       "title": "Resource Record Type"
     },
-    "hostname": {
-      "type": "string",
-      "title": "Hostname"
-    },
     "class": {
       "type": "string",
       "title": "Resource Record Class"
@@ -22,6 +18,10 @@
       "type": "string",
       "title": "DNS Opcode"
     },
+    "hostname": {
+      "type": "string",
+      "title": "Hostname"
+    },
     "opcode_id": {
       "type": "integer",
       "title": "DNS Opcode ID"
diff --git a/components/camel-ocsf/src/main/resources/schema/EmailActivity.json b/components/camel-ocsf/src/main/resources/schema/EmailActivity.json
index 999efc6f6db0..443d82fdff0f 100644
--- a/components/camel-ocsf/src/main/resources/schema/EmailActivity.json
+++ b/components/camel-ocsf/src/main/resources/schema/EmailActivity.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/classes/email_activity",
+  "$id": "https://schema.ocsf.io/1.8.0/classes/email_activity",
   "title": "EmailActivity",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.EmailActivity",
@@ -9,53 +9,40 @@
     "$ref": "OcsfEvent.json"
   },
   "properties": {
-    "email": {
-      "type": "object",
-      "additionalProperties": true
+    "src_endpoint": {
+      "$ref": "NetworkEndpoint.json"
     },
-    "protocol_name": {
+    "message_trace_uid": {
       "type": "string",
-      "title": "Protocol Name"
-    },
-    "raw_data_size": {
-      "type": "integer",
-      "title": "Raw Data Size"
-    },
-    "enrichments": {
-      "type": "array",
-      "description": "",
-      "items": {
-        "$ref": "Enrichment.json"
-      }
-    },
-    "attempt": {
-      "type": "integer",
-      "title": "Attempt"
+      "title": "Message Trace UID"
     },
     "smtp_hello": {
       "type": "string",
       "title": "SMTP Hello"
     },
-    "message_trace_uid": {
-      "type": "string",
-      "title": "Message Trace UID"
+    "dst_endpoint": {
+      "$ref": "NetworkEndpoint.json"
     },
-    "direction": {
-      "type": "string",
-      "title": "Direction"
+    "email": {
+      "type": "object",
+      "additionalProperties": true
     },
-    "from": {
-      "type": "string",
-      "title": "From",
-      "pattern": "^[a-zA-Z0-9!#$%&'*+-/=?^_`{|}~.]+@[a-zA-Z0-9-]+\\.[a-zA-Z0-9-.]+$"
+    "direction_id": {
+      "type": "integer",
+      "title": "Direction ID"
     },
-    "src_endpoint": {
-      "$ref": "NetworkEndpoint.json"
+    "attempt": {
+      "type": "integer",
+      "title": "Attempt"
     },
     "command": {
       "type": "string",
       "title": "Command"
     },
+    "banner": {
+      "type": "string",
+      "title": "Protocol Banner"
+    },
     "to": {
       "type": "array",
       "title": "To",
@@ -64,23 +51,36 @@
         "pattern": "^[a-zA-Z0-9!#$%&'*+-/=?^_`{|}~.]+@[a-zA-Z0-9-]+\\.[a-zA-Z0-9-.]+$"
       }
     },
-    "banner": {
+    "from": {
       "type": "string",
-      "title": "Protocol Banner"
+      "title": "From",
+      "pattern": "^[a-zA-Z0-9!#$%&'*+-/=?^_`{|}~.]+@[a-zA-Z0-9-]+\\.[a-zA-Z0-9-.]+$"
     },
-    "dst_endpoint": {
-      "$ref": "NetworkEndpoint.json"
+    "email_auth": {
+      "type": "object",
+      "additionalProperties": true
     },
-    "direction_id": {
+    "protocol_name": {
+      "type": "string",
+      "title": "Protocol Name"
+    },
+    "raw_data_size": {
       "type": "integer",
-      "title": "Direction ID"
+      "title": "Raw Data Size"
+    },
+    "direction": {
+      "type": "string",
+      "title": "Direction"
     },
     "raw_data_hash": {
       "$ref": "Fingerprint.json"
     },
-    "email_auth": {
-      "type": "object",
-      "additionalProperties": true
+    "enrichments": {
+      "type": "array",
+      "description": "",
+      "items": {
+        "$ref": "Enrichment.json"
+      }
     }
   }
 }
\ No newline at end of file
diff --git a/components/camel-ocsf/src/main/resources/schema/Endpoint.json b/components/camel-ocsf/src/main/resources/schema/Endpoint.json
index 244061bbc841..ffdec6176e7f 100644
--- a/components/camel-ocsf/src/main/resources/schema/Endpoint.json
+++ b/components/camel-ocsf/src/main/resources/schema/Endpoint.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/endpoint",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/endpoint",
   "title": "Endpoint",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.Endpoint",
@@ -29,17 +29,20 @@
       "title": "IP Address",
       "pattern": "((^\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]).){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\s*$)|(^\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa- [...]
     },
+    "pool": {
+      "$ref": "Group.json"
+    },
     "location": {
       "$ref": "Location.json"
     },
-    "hostname": {
-      "type": "string",
-      "title": "Hostname"
-    },
     "uid": {
       "type": "string",
       "title": "Unique ID"
     },
+    "hostname": {
+      "type": "string",
+      "title": "Hostname"
+    },
     "mac": {
       "type": "string",
       "title": "MAC Address",
@@ -72,6 +75,10 @@
       "type": "string",
       "title": "Network Interface ID"
     },
+    "mac_vendor": {
+      "type": "string",
+      "title": "MAC Vendor"
+    },
     "subnet_uid": {
       "type": "string",
       "title": "Subnet UID"
diff --git a/components/camel-ocsf/src/main/resources/schema/Enrichment.json b/components/camel-ocsf/src/main/resources/schema/Enrichment.json
index ab6fdb5e0466..eb02425d1ca8 100644
--- a/components/camel-ocsf/src/main/resources/schema/Enrichment.json
+++ b/components/camel-ocsf/src/main/resources/schema/Enrichment.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/enrichment",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/enrichment",
   "title": "Enrichment",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.Enrichment",
diff --git a/components/camel-ocsf/src/main/resources/schema/EntityManagement.json b/components/camel-ocsf/src/main/resources/schema/EntityManagement.json
index 268f59655b89..71be5230ec46 100644
--- a/components/camel-ocsf/src/main/resources/schema/EntityManagement.json
+++ b/components/camel-ocsf/src/main/resources/schema/EntityManagement.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/classes/entity_management",
+  "$id": "https://schema.ocsf.io/1.8.0/classes/entity_management",
   "title": "EntityManagement",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.EntityManagement",
@@ -9,32 +9,30 @@
     "$ref": "OcsfEvent.json"
   },
   "properties": {
-    "actor": {
-      "$ref": "Actor.json"
+    "entity": {
+      "type": "object",
+      "additionalProperties": true
     },
-    "raw_data_size": {
+    "access_mask": {
       "type": "integer",
-      "title": "Raw Data Size"
+      "title": "Access Mask"
+    },
+    "src_endpoint": {
+      "$ref": "NetworkEndpoint.json"
     },
     "http_response": {
       "$ref": "HttpResponse.json"
     },
-    "enrichments": {
-      "type": "array",
-      "description": "",
-      "items": {
-        "$ref": "Enrichment.json"
-      }
-    },
-    "http_request": {
-      "$ref": "HttpRequest.json"
+    "actor": {
+      "$ref": "Actor.json"
     },
-    "src_endpoint": {
-      "$ref": "NetworkEndpoint.json"
+    "entity_result": {
+      "type": "object",
+      "additionalProperties": true
     },
-    "access_mask": {
-      "type": "integer",
-      "title": "Access Mask"
+    "comment": {
+      "type": "string",
+      "title": "Comment"
     },
     "access_list": {
       "type": "array",
@@ -43,20 +41,22 @@
         "type": "string"
       }
     },
-    "comment": {
-      "type": "string",
-      "title": "Comment"
+    "http_request": {
+      "$ref": "HttpRequest.json"
     },
-    "entity": {
-      "type": "object",
-      "additionalProperties": true
+    "raw_data_size": {
+      "type": "integer",
+      "title": "Raw Data Size"
     },
     "raw_data_hash": {
       "$ref": "Fingerprint.json"
     },
-    "entity_result": {
-      "type": "object",
-      "additionalProperties": true
+    "enrichments": {
+      "type": "array",
+      "description": "",
+      "items": {
+        "$ref": "Enrichment.json"
+      }
     }
   }
 }
\ No newline at end of file
diff --git a/components/camel-ocsf/src/main/resources/schema/Epss.json b/components/camel-ocsf/src/main/resources/schema/Epss.json
index a0fbd58c5a95..38806ff31cef 100644
--- a/components/camel-ocsf/src/main/resources/schema/Epss.json
+++ b/components/camel-ocsf/src/main/resources/schema/Epss.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/epss",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/epss",
   "title": "Epss",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.Epss",
diff --git a/components/camel-ocsf/src/main/resources/schema/Extension.json b/components/camel-ocsf/src/main/resources/schema/Extension.json
index 0a8f33203ef8..c75e9ea8c18c 100644
--- a/components/camel-ocsf/src/main/resources/schema/Extension.json
+++ b/components/camel-ocsf/src/main/resources/schema/Extension.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/extension",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/extension",
   "title": "Extension",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.Extension",
diff --git a/components/camel-ocsf/src/main/resources/schema/Feature.json b/components/camel-ocsf/src/main/resources/schema/Feature.json
index e2487b673dc2..c18658d4583a 100644
--- a/components/camel-ocsf/src/main/resources/schema/Feature.json
+++ b/components/camel-ocsf/src/main/resources/schema/Feature.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/feature",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/feature",
   "title": "Feature",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.Feature",
diff --git a/components/camel-ocsf/src/main/resources/schema/File.json b/components/camel-ocsf/src/main/resources/schema/File.json
index c3b40aeecc6c..dce7867772f2 100644
--- a/components/camel-ocsf/src/main/resources/schema/File.json
+++ b/components/camel-ocsf/src/main/resources/schema/File.json
@@ -1,70 +1,17 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/file",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/file",
   "title": "File",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.File",
   "additionalProperties": true,
   "properties": {
-    "uid": {
-      "type": "string",
-      "title": "Unique ID"
-    },
-    "desc": {
-      "type": "string",
-      "title": "Description"
-    },
-    "drive_type": {
-      "type": "string",
-      "title": "Drive Type"
-    },
-    "encryption_details": {
-      "type": "object",
-      "additionalProperties": true
-    },
-    "internal_name": {
-      "type": "string",
-      "title": "Internal Name"
-    },
-    "accessed_time": {
-      "type": "integer",
-      "existingJavaType": "java.lang.Long",
-      "title": "Accessed Time"
-    },
-    "confidentiality": {
-      "type": "string",
-      "title": "Confidentiality"
-    },
     "product": {
       "$ref": "Product.json"
     },
-    "uri": {
-      "type": "string",
-      "title": "File URI"
-    },
-    "size": {
-      "type": "integer",
-      "title": "Size"
-    },
-    "xattributes": {
-      "type": "object",
-      "additionalProperties": true
-    },
-    "hashes": {
-      "type": "array",
-      "title": "Hashes",
-      "items": {
-        "$ref": "Fingerprint.json"
-      }
-    },
-    "attributes": {
-      "type": "integer",
-      "title": "Attributes"
-    },
-    "created_time": {
+    "drive_type_id": {
       "type": "integer",
-      "existingJavaType": "java.lang.Long",
-      "title": "Created Time"
+      "title": "Drive Type ID"
     },
     "tags": {
       "type": "array",
@@ -74,97 +21,165 @@
         "additionalProperties": true
       }
     },
-    "creator": {
-      "$ref": "User.json"
-    },
     "owner": {
       "$ref": "User.json"
     },
-    "security_descriptor": {
+    "drive_type": {
       "type": "string",
-      "title": "Security Descriptor"
+      "title": "Drive Type"
     },
-    "volume": {
+    "type": {
       "type": "string",
-      "title": "Volume"
+      "title": "Type"
     },
-    "is_system": {
-      "type": "boolean",
-      "title": "System"
+    "hashes": {
+      "type": "array",
+      "title": "Hashes",
+      "items": {
+        "$ref": "Fingerprint.json"
+      }
     },
-    "type_id": {
+    "attributes": {
       "type": "integer",
-      "title": "Type ID"
+      "title": "Attributes"
     },
-    "path": {
+    "security_descriptor": {
       "type": "string",
-      "title": "Path"
-    },
-    "drive_type_id": {
-      "type": "integer",
-      "title": "Drive Type ID"
+      "title": "Security Descriptor"
     },
-    "version": {
+    "confidentiality": {
       "type": "string",
-      "title": "Version"
-    },
-    "confidentiality_id": {
-      "type": "integer",
-      "title": "Confidentiality ID"
+      "title": "Confidentiality"
     },
-    "is_encrypted": {
-      "type": "boolean",
-      "title": "Encrypted"
+    "uri": {
+      "type": "string",
+      "title": "File URI"
     },
     "modified_time": {
       "type": "integer",
       "existingJavaType": "java.lang.Long",
       "title": "Modified Time"
     },
+    "is_deleted": {
+      "type": "boolean",
+      "title": "Deleted"
+    },
     "name": {
       "type": "string",
       "title": "Name"
     },
+    "mime_type": {
+      "type": "string",
+      "title": "MIME type"
+    },
     "signature": {
       "type": "object",
       "additionalProperties": true
     },
-    "url": {
-      "$ref": "Url.json"
+    "confidentiality_id": {
+      "type": "integer",
+      "title": "Confidentiality ID"
     },
-    "modifier": {
+    "creator": {
       "$ref": "User.json"
     },
-    "is_deleted": {
+    "is_readonly": {
       "type": "boolean",
-      "title": "Deleted"
+      "title": "Read-Only"
+    },
+    "encryption_details": {
+      "type": "object",
+      "additionalProperties": true
+    },
+    "volume": {
+      "type": "string",
+      "title": "Volume"
+    },
+    "url": {
+      "$ref": "Url.json"
     },
     "parent_folder": {
       "type": "string",
       "title": "Parent Folder"
     },
-    "company_name": {
+    "imported_symbols": {
+      "type": "array",
+      "title": "Imported Symbols",
+      "items": {
+        "type": "string"
+      }
+    },
+    "is_system": {
+      "type": "boolean",
+      "title": "System"
+    },
+    "version": {
       "type": "string",
-      "title": "Company Name"
+      "title": "Version"
     },
-    "type": {
+    "accessed_time": {
+      "type": "integer",
+      "existingJavaType": "java.lang.Long",
+      "title": "Accessed Time"
+    },
+    "signatures": {
+      "type": "array",
+      "title": "Digital Signatures",
+      "items": {
+        "type": "object",
+        "additionalProperties": true
+      }
+    },
+    "xattributes": {
+      "type": "object",
+      "additionalProperties": true
+    },
+    "path": {
       "type": "string",
-      "title": "Type"
+      "title": "Path"
     },
-    "mime_type": {
+    "desc": {
       "type": "string",
-      "title": "MIME type"
+      "title": "Description"
     },
-    "is_readonly": {
-      "type": "boolean",
-      "title": "Read-Only"
+    "type_id": {
+      "type": "integer",
+      "title": "Type ID"
+    },
+    "internal_name": {
+      "type": "string",
+      "title": "Internal Name"
+    },
+    "size": {
+      "type": "integer",
+      "title": "Size"
+    },
+    "modifier": {
+      "$ref": "User.json"
     },
     "ext": {
       "type": "string",
       "title": "File Extension"
     },
+    "created_time": {
+      "type": "integer",
+      "existingJavaType": "java.lang.Long",
+      "title": "Created Time"
+    },
     "accessor": {
       "$ref": "User.json"
+    },
+    "uid": {
+      "type": "string",
+      "title": "Unique ID"
+    },
+    "is_encrypted": {
+      "type": "boolean",
+      "title": "Encrypted"
+    },
+    "company_name": {
+      "type": "string",
+      "title": "Company Name"
     }
   },
   "description": "The File object."
diff --git a/components/camel-ocsf/src/main/resources/schema/FileActivity.json b/components/camel-ocsf/src/main/resources/schema/FileActivity.json
index 0ee4d5fb74c0..6f5f92fb1451 100644
--- a/components/camel-ocsf/src/main/resources/schema/FileActivity.json
+++ b/components/camel-ocsf/src/main/resources/schema/FileActivity.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/classes/file_activity",
+  "$id": "https://schema.ocsf.io/1.8.0/classes/file_activity",
   "title": "FileActivity",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.FileActivity",
@@ -9,51 +9,51 @@
     "$ref": "OcsfEvent.json"
   },
   "properties": {
+    "access_mask": {
+      "type": "integer",
+      "title": "Access Mask"
+    },
+    "create_mask": {
+      "type": "string",
+      "title": "Create Mask"
+    },
     "actor": {
       "$ref": "Actor.json"
     },
-    "raw_data_size": {
-      "type": "integer",
-      "title": "Raw Data Size"
+    "file_diff": {
+      "type": "string",
+      "title": "File Diff"
     },
     "device": {
       "$ref": "Device.json"
     },
-    "file": {
-      "$ref": "File.json"
-    },
-    "enrichments": {
-      "type": "array",
-      "description": "",
-      "items": {
-        "$ref": "Enrichment.json"
-      }
-    },
-    "file_diff": {
+    "connection_uid": {
       "type": "string",
-      "title": "File Diff"
+      "title": "Connection Identifier"
     },
     "file_result": {
       "$ref": "File.json"
     },
-    "access_mask": {
-      "type": "integer",
-      "title": "Access Mask"
-    },
-    "connection_uid": {
+    "component": {
       "type": "string",
-      "title": "Connection Identifier"
+      "title": "Component"
+    },
+    "raw_data_size": {
+      "type": "integer",
+      "title": "Raw Data Size"
     },
     "raw_data_hash": {
       "$ref": "Fingerprint.json"
     },
-    "create_mask": {
-      "type": "string",
-      "title": "Create Mask"
+    "file": {
+      "$ref": "File.json"
     },
-    "component": {
-      "type": "string",
-      "title": "Component"
+    "enrichments": {
+      "type": "array",
+      "description": "",
+      "items": {
+        "$ref": "Enrichment.json"
+      }
     }
   }
 }
\ No newline at end of file
diff --git a/components/camel-ocsf/src/main/resources/schema/FindingInfo.json b/components/camel-ocsf/src/main/resources/schema/FindingInfo.json
index d4f878748963..a6f87017115a 100644
--- a/components/camel-ocsf/src/main/resources/schema/FindingInfo.json
+++ b/components/camel-ocsf/src/main/resources/schema/FindingInfo.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/finding_info",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/finding_info",
   "title": "FindingInfo",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.FindingInfo",
diff --git a/components/camel-ocsf/src/main/resources/schema/Fingerprint.json b/components/camel-ocsf/src/main/resources/schema/Fingerprint.json
index aca67bf0b8b5..1305ff4df8ec 100644
--- a/components/camel-ocsf/src/main/resources/schema/Fingerprint.json
+++ b/components/camel-ocsf/src/main/resources/schema/Fingerprint.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/fingerprint",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/fingerprint",
   "title": "Fingerprint",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.Fingerprint",
@@ -8,8 +8,7 @@
   "properties": {
     "value": {
       "type": "string",
-      "title": "Value",
-      "pattern": "^[a-fA-F0-9]+$"
+      "title": "Value"
     },
     "algorithm": {
       "type": "string",
diff --git a/components/camel-ocsf/src/main/resources/schema/FtpActivity.json b/components/camel-ocsf/src/main/resources/schema/FtpActivity.json
index 7ec27ac940c0..59a6841a3841 100644
--- a/components/camel-ocsf/src/main/resources/schema/FtpActivity.json
+++ b/components/camel-ocsf/src/main/resources/schema/FtpActivity.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/classes/ftp_activity",
+  "$id": "https://schema.ocsf.io/1.8.0/classes/ftp_activity",
   "title": "FtpActivity",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.FtpActivity",
@@ -9,32 +9,59 @@
     "$ref": "OcsfEvent.json"
   },
   "properties": {
-    "cumulative_traffic": {
-      "type": "object",
-      "additionalProperties": true
+    "ja4_fingerprint_list": {
+      "type": "array",
+      "title": "JA4+ Fingerprints",
+      "items": {
+        "$ref": "Ja4Fingerprint.json"
+      }
     },
-    "connection_info": {
-      "type": "object",
-      "additionalProperties": true
+    "observation_point": {
+      "type": "string",
+      "title": "Observation Point"
     },
-    "raw_data_size": {
+    "src_endpoint": {
+      "$ref": "NetworkEndpoint.json"
+    },
+    "port": {
       "type": "integer",
-      "title": "Raw Data Size"
+      "title": "Port",
+      "minimum": 0,
+      "maximum": 65535
     },
-    "file": {
-      "$ref": "File.json"
+    "type": {
+      "type": "string",
+      "title": "Type"
     },
-    "enrichments": {
+    "tls": {
+      "$ref": "Tls.json"
+    },
+    "cumulative_traffic": {
+      "type": "object",
+      "additionalProperties": true
+    },
+    "dst_endpoint": {
+      "$ref": "NetworkEndpoint.json"
+    },
+    "packet_list": {
       "type": "array",
       "description": "",
       "items": {
-        "$ref": "Enrichment.json"
+        "$ref": "Packet.json"
       }
     },
-    "traffic": {
+    "name": {
+      "type": "string",
+      "title": "Name"
+    },
+    "connection_info": {
       "type": "object",
       "additionalProperties": true
     },
+    "app_name": {
+      "type": "string",
+      "title": "Application Name"
+    },
     "codes": {
       "type": "array",
       "title": "Response Codes",
@@ -42,12 +69,16 @@
         "type": "integer"
       }
     },
-    "src_endpoint": {
+    "traffic": {
+      "type": "object",
+      "additionalProperties": true
+    },
+    "network_observation_point": {
       "$ref": "NetworkEndpoint.json"
     },
-    "app_name": {
+    "command": {
       "type": "string",
-      "title": "Application Name"
+      "title": "Command"
     },
     "command_responses": {
       "type": "array",
@@ -56,36 +87,9 @@
         "type": "string"
       }
     },
-    "command": {
-      "type": "string",
-      "title": "Command"
-    },
-    "dst_endpoint": {
-      "$ref": "NetworkEndpoint.json"
-    },
-    "port": {
-      "type": "integer",
-      "title": "Port",
-      "minimum": 0,
-      "maximum": 65535
-    },
-    "raw_data_hash": {
-      "$ref": "Fingerprint.json"
-    },
-    "ja4_fingerprint_list": {
-      "type": "array",
-      "title": "JA4+ Fingerprints",
-      "items": {
-        "$ref": "Ja4Fingerprint.json"
-      }
-    },
-    "name": {
+    "app_protocol_name": {
       "type": "string",
-      "title": "Name"
-    },
-    "type": {
-      "type": "string",
-      "title": "Type"
+      "title": "Application Protocol Name"
     },
     "observation_point_id": {
       "type": "integer",
@@ -95,12 +99,22 @@
       "type": "object",
       "additionalProperties": true
     },
-    "observation_point": {
-      "type": "string",
-      "title": "Observation Point"
+    "raw_data_size": {
+      "type": "integer",
+      "title": "Raw Data Size"
     },
-    "tls": {
-      "$ref": "Tls.json"
+    "raw_data_hash": {
+      "$ref": "Fingerprint.json"
+    },
+    "file": {
+      "$ref": "File.json"
+    },
+    "enrichments": {
+      "type": "array",
+      "description": "",
+      "items": {
+        "$ref": "Enrichment.json"
+      }
     }
   }
 }
\ No newline at end of file
diff --git a/components/camel-ocsf/src/main/resources/schema/Group.json b/components/camel-ocsf/src/main/resources/schema/Group.json
index bafa103bbf21..7bbd4c3b1a6d 100644
--- a/components/camel-ocsf/src/main/resources/schema/Group.json
+++ b/components/camel-ocsf/src/main/resources/schema/Group.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/group",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/group",
   "title": "Group",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.Group",
@@ -12,7 +12,7 @@
     },
     "type": {
       "type": "string",
-      "title": "Account Type"
+      "title": "Group Type"
     },
     "domain": {
       "type": "string",
@@ -32,6 +32,10 @@
       "items": {
         "type": "string"
       }
+    },
+    "uid_alt": {
+      "type": "string",
+      "title": "Alternate ID"
     }
   },
   "description": "The Group object."
diff --git a/components/camel-ocsf/src/main/resources/schema/GroupManagement.json b/components/camel-ocsf/src/main/resources/schema/GroupManagement.json
index b8527c75e3ff..37514c0e10b2 100644
--- a/components/camel-ocsf/src/main/resources/schema/GroupManagement.json
+++ b/components/camel-ocsf/src/main/resources/schema/GroupManagement.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/classes/group_management",
+  "$id": "https://schema.ocsf.io/1.8.0/classes/group_management",
   "title": "GroupManagement",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.GroupManagement",
@@ -9,6 +9,24 @@
     "$ref": "OcsfEvent.json"
   },
   "properties": {
+    "src_endpoint": {
+      "$ref": "NetworkEndpoint.json"
+    },
+    "http_response": {
+      "$ref": "HttpResponse.json"
+    },
+    "user": {
+      "$ref": "User.json"
+    },
+    "subgroup": {
+      "$ref": "Group.json"
+    },
+    "actor": {
+      "$ref": "Actor.json"
+    },
+    "group": {
+      "$ref": "Group.json"
+    },
     "privileges": {
       "type": "array",
       "title": "Privileges",
@@ -16,15 +34,18 @@
         "type": "string"
       }
     },
-    "actor": {
-      "$ref": "Actor.json"
+    "http_request": {
+      "$ref": "HttpRequest.json"
+    },
+    "resource": {
+      "$ref": "ResourceDetails.json"
     },
     "raw_data_size": {
       "type": "integer",
       "title": "Raw Data Size"
     },
-    "http_response": {
-      "$ref": "HttpResponse.json"
+    "raw_data_hash": {
+      "$ref": "Fingerprint.json"
     },
     "enrichments": {
       "type": "array",
@@ -32,27 +53,6 @@
       "items": {
         "$ref": "Enrichment.json"
       }
-    },
-    "http_request": {
-      "$ref": "HttpRequest.json"
-    },
-    "src_endpoint": {
-      "$ref": "NetworkEndpoint.json"
-    },
-    "group": {
-      "$ref": "Group.json"
-    },
-    "user": {
-      "$ref": "User.json"
-    },
-    "subgroup": {
-      "$ref": "Group.json"
-    },
-    "resource": {
-      "$ref": "ResourceDetails.json"
-    },
-    "raw_data_hash": {
-      "$ref": "Fingerprint.json"
     }
   }
 }
\ No newline at end of file
diff --git a/components/camel-ocsf/src/main/resources/schema/HttpActivity.json b/components/camel-ocsf/src/main/resources/schema/HttpActivity.json
index a15f6ae264da..19019b660157 100644
--- a/components/camel-ocsf/src/main/resources/schema/HttpActivity.json
+++ b/components/camel-ocsf/src/main/resources/schema/HttpActivity.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/classes/http_activity",
+  "$id": "https://schema.ocsf.io/1.8.0/classes/http_activity",
   "title": "HttpActivity",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.HttpActivity",
@@ -9,30 +9,29 @@
     "$ref": "OcsfEvent.json"
   },
   "properties": {
-    "cumulative_traffic": {
-      "type": "object",
-      "additionalProperties": true
+    "ja4_fingerprint_list": {
+      "type": "array",
+      "title": "JA4+ Fingerprints",
+      "items": {
+        "$ref": "Ja4Fingerprint.json"
+      }
     },
-    "connection_info": {
-      "type": "object",
-      "additionalProperties": true
+    "observation_point": {
+      "type": "string",
+      "title": "Observation Point"
     },
-    "raw_data_size": {
-      "type": "integer",
-      "title": "Raw Data Size"
+    "src_endpoint": {
+      "$ref": "NetworkEndpoint.json"
     },
     "http_response": {
       "$ref": "HttpResponse.json"
     },
-    "file": {
-      "$ref": "File.json"
+    "tls": {
+      "$ref": "Tls.json"
     },
-    "enrichments": {
-      "type": "array",
-      "description": "",
-      "items": {
-        "$ref": "Enrichment.json"
-      }
+    "cumulative_traffic": {
+      "type": "object",
+      "additionalProperties": true
     },
     "http_cookies": {
       "type": "array",
@@ -42,36 +41,41 @@
         "additionalProperties": true
       }
     },
-    "traffic": {
-      "type": "object",
-      "additionalProperties": true
+    "dst_endpoint": {
+      "$ref": "NetworkEndpoint.json"
     },
-    "http_request": {
-      "$ref": "HttpRequest.json"
+    "packet_list": {
+      "type": "array",
+      "description": "",
+      "items": {
+        "$ref": "Packet.json"
+      }
     },
-    "src_endpoint": {
-      "$ref": "NetworkEndpoint.json"
+    "connection_info": {
+      "type": "object",
+      "additionalProperties": true
     },
     "app_name": {
       "type": "string",
       "title": "Application Name"
     },
+    "traffic": {
+      "type": "object",
+      "additionalProperties": true
+    },
+    "network_observation_point": {
+      "$ref": "NetworkEndpoint.json"
+    },
     "http_status": {
       "type": "integer",
       "title": "HTTP Status"
     },
-    "dst_endpoint": {
-      "$ref": "NetworkEndpoint.json"
-    },
-    "raw_data_hash": {
-      "$ref": "Fingerprint.json"
+    "http_request": {
+      "$ref": "HttpRequest.json"
     },
-    "ja4_fingerprint_list": {
-      "type": "array",
-      "title": "JA4+ Fingerprints",
-      "items": {
-        "$ref": "Ja4Fingerprint.json"
-      }
+    "app_protocol_name": {
+      "type": "string",
+      "title": "Application Protocol Name"
     },
     "observation_point_id": {
       "type": "integer",
@@ -81,12 +85,22 @@
       "type": "object",
       "additionalProperties": true
     },
-    "observation_point": {
-      "type": "string",
-      "title": "Observation Point"
+    "raw_data_size": {
+      "type": "integer",
+      "title": "Raw Data Size"
     },
-    "tls": {
-      "$ref": "Tls.json"
+    "raw_data_hash": {
+      "$ref": "Fingerprint.json"
+    },
+    "file": {
+      "$ref": "File.json"
+    },
+    "enrichments": {
+      "type": "array",
+      "description": "",
+      "items": {
+        "$ref": "Enrichment.json"
+      }
     }
   }
 }
\ No newline at end of file
diff --git a/components/camel-ocsf/src/main/resources/schema/HttpHeader.json b/components/camel-ocsf/src/main/resources/schema/HttpHeader.json
index 53d3437d7b68..8503fd5ea94a 100644
--- a/components/camel-ocsf/src/main/resources/schema/HttpHeader.json
+++ b/components/camel-ocsf/src/main/resources/schema/HttpHeader.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/http_header",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/http_header",
   "title": "HttpHeader",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.HttpHeader",
diff --git a/components/camel-ocsf/src/main/resources/schema/HttpRequest.json b/components/camel-ocsf/src/main/resources/schema/HttpRequest.json
index f782c0604173..324803e51a01 100644
--- a/components/camel-ocsf/src/main/resources/schema/HttpRequest.json
+++ b/components/camel-ocsf/src/main/resources/schema/HttpRequest.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/http_request",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/http_request",
   "title": "HttpRequest",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.HttpRequest",
@@ -25,6 +25,14 @@
     "url": {
       "$ref": "Url.json"
     },
+    "x_forwarded_for": {
+      "type": "array",
+      "title": "X-Forwarded-For",
+      "items": {
+        "type": "string",
+        "pattern": "((^\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]).){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\s*$)|(^\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-F [...]
+      }
+    },
     "body_length": {
       "type": "integer",
       "title": "Request Body Length"
@@ -58,14 +66,6 @@
     "referrer": {
       "type": "string",
       "title": "HTTP Referrer"
-    },
-    "x_forwarded_for": {
-      "type": "array",
-      "title": "X-Forwarded-For",
-      "items": {
-        "type": "string",
-        "pattern": "((^\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]).){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\s*$)|(^\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-F [...]
-      }
     }
   },
   "description": "The HTTP Request object."
diff --git a/components/camel-ocsf/src/main/resources/schema/HttpResponse.json b/components/camel-ocsf/src/main/resources/schema/HttpResponse.json
index aec52f1a33f2..78396be22a2a 100644
--- a/components/camel-ocsf/src/main/resources/schema/HttpResponse.json
+++ b/components/camel-ocsf/src/main/resources/schema/HttpResponse.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/http_response",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/http_response",
   "title": "HttpResponse",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.HttpResponse",
diff --git a/components/camel-ocsf/src/main/resources/schema/Idp.json b/components/camel-ocsf/src/main/resources/schema/Idp.json
index efdfbab79f39..2a3d7cfcc707 100644
--- a/components/camel-ocsf/src/main/resources/schema/Idp.json
+++ b/components/camel-ocsf/src/main/resources/schema/Idp.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/idp",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/idp",
   "title": "Idp",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.Idp",
diff --git a/components/camel-ocsf/src/main/resources/schema/Image.json b/components/camel-ocsf/src/main/resources/schema/Image.json
index 7a156cc4bc67..eca39c1b8af7 100644
--- a/components/camel-ocsf/src/main/resources/schema/Image.json
+++ b/components/camel-ocsf/src/main/resources/schema/Image.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/image",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/image",
   "title": "Image",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.Image",
diff --git a/components/camel-ocsf/src/main/resources/schema/IncidentFinding.json b/components/camel-ocsf/src/main/resources/schema/IncidentFinding.json
index 4b5c8585db34..2cd81caf5418 100644
--- a/components/camel-ocsf/src/main/resources/schema/IncidentFinding.json
+++ b/components/camel-ocsf/src/main/resources/schema/IncidentFinding.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/classes/incident_finding",
+  "$id": "https://schema.ocsf.io/1.8.0/classes/incident_finding",
   "title": "IncidentFinding",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.IncidentFinding",
@@ -9,85 +9,80 @@
     "$ref": "OcsfEvent.json"
   },
   "properties": {
-    "verdict_id": {
+    "impact_id": {
       "type": "integer",
-      "title": "Verdict ID"
+      "title": "Impact ID"
     },
-    "desc": {
-      "type": "string",
-      "title": "Description"
+    "finding_info_list": {
+      "type": "array",
+      "title": "Finding Information List",
+      "items": {
+        "$ref": "FindingInfo.json"
+      }
     },
-    "impact": {
+    "ticket": {
+      "$ref": "Ticket.json"
+    },
+    "priority": {
       "type": "string",
-      "title": "Impact"
+      "title": "Priority"
     },
-    "raw_data_size": {
+    "impact_score": {
       "type": "integer",
-      "title": "Raw Data Size"
-    },
-    "ticket": {
-      "$ref": "Ticket.json"
+      "title": "Impact Score"
     },
-    "enrichments": {
+    "tickets": {
       "type": "array",
-      "description": "",
+      "title": "Tickets",
       "items": {
-        "$ref": "Enrichment.json"
+        "$ref": "Ticket.json"
       }
     },
-    "confidence_score": {
-      "type": "integer",
-      "title": "Confidence Score"
+    "comment": {
+      "type": "string",
+      "title": "Comment"
     },
-    "impact_id": {
+    "verdict_id": {
       "type": "integer",
-      "title": "Impact ID"
+      "title": "Verdict ID"
     },
-    "verdict": {
-      "type": "string",
-      "title": "Verdict"
+    "assignee_group": {
+      "$ref": "Group.json"
     },
-    "src_url": {
+    "confidence": {
       "type": "string",
-      "title": "Source URL"
-    },
-    "assignee": {
-      "$ref": "User.json"
-    },
-    "finding_info_list": {
-      "type": "array",
-      "title": "Finding Information List",
-      "items": {
-        "$ref": "FindingInfo.json"
-      }
+      "title": "Confidence"
     },
     "confidence_id": {
       "type": "integer",
       "title": "Confidence ID"
     },
-    "comment": {
+    "desc": {
       "type": "string",
-      "title": "Comment"
+      "title": "Description"
     },
-    "assignee_group": {
-      "$ref": "Group.json"
+    "confidence_score": {
+      "type": "integer",
+      "title": "Confidence Score"
     },
     "priority_id": {
       "type": "integer",
       "title": "Priority ID"
     },
+    "verdict": {
+      "type": "string",
+      "title": "Verdict"
+    },
     "vendor_attributes": {
       "$ref": "VendorAttributes.json"
     },
-    "tickets": {
-      "type": "array",
-      "title": "Tickets",
-      "items": {
-        "$ref": "Ticket.json"
-      }
+    "impact": {
+      "type": "string",
+      "title": "Impact"
     },
-    "raw_data_hash": {
-      "$ref": "Fingerprint.json"
+    "is_suspected_breach": {
+      "type": "boolean",
+      "title": "Suspected Breach"
     },
     "attacks": {
       "type": "array",
@@ -96,21 +91,26 @@
         "$ref": "Attack.json"
       }
     },
-    "priority": {
-      "type": "string",
-      "title": "Priority"
-    },
-    "is_suspected_breach": {
-      "type": "boolean",
-      "title": "Suspected Breach"
+    "assignee": {
+      "$ref": "User.json"
     },
-    "impact_score": {
+    "raw_data_size": {
       "type": "integer",
-      "title": "Impact Score"
+      "title": "Raw Data Size"
     },
-    "confidence": {
+    "raw_data_hash": {
+      "$ref": "Fingerprint.json"
+    },
+    "enrichments": {
+      "type": "array",
+      "description": "",
+      "items": {
+        "$ref": "Enrichment.json"
+      }
+    },
+    "src_url": {
       "type": "string",
-      "title": "Confidence"
+      "title": "Source URL"
     }
   }
 }
\ No newline at end of file
diff --git a/components/camel-ocsf/src/main/resources/schema/Ja4Fingerprint.json b/components/camel-ocsf/src/main/resources/schema/Ja4Fingerprint.json
index 98a4be6700c5..1f8aab5417e2 100644
--- a/components/camel-ocsf/src/main/resources/schema/Ja4Fingerprint.json
+++ b/components/camel-ocsf/src/main/resources/schema/Ja4Fingerprint.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/ja4_fingerprint",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/ja4_fingerprint",
   "title": "Ja4Fingerprint",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.Ja4Fingerprint",
diff --git a/components/camel-ocsf/src/main/resources/schema/KbArticle.json b/components/camel-ocsf/src/main/resources/schema/KbArticle.json
index 0ec2b4ca3a86..27207a40d2bf 100644
--- a/components/camel-ocsf/src/main/resources/schema/KbArticle.json
+++ b/components/camel-ocsf/src/main/resources/schema/KbArticle.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/kb_article",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/kb_article",
   "title": "KbArticle",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.KbArticle",
diff --git a/components/camel-ocsf/src/main/resources/schema/KernelActivity.json b/components/camel-ocsf/src/main/resources/schema/KernelActivity.json
index 784c1619cdba..a5a12c023b97 100644
--- a/components/camel-ocsf/src/main/resources/schema/KernelActivity.json
+++ b/components/camel-ocsf/src/main/resources/schema/KernelActivity.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/classes/kernel_activity",
+  "$id": "https://schema.ocsf.io/1.8.0/classes/kernel_activity",
   "title": "KernelActivity",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.KernelActivity",
@@ -9,16 +9,16 @@
     "$ref": "OcsfEvent.json"
   },
   "properties": {
-    "actor": {
-      "$ref": "Actor.json"
-    },
-    "raw_data_size": {
-      "type": "integer",
-      "title": "Raw Data Size"
-    },
     "device": {
       "$ref": "Device.json"
     },
+    "kernel": {
+      "type": "object",
+      "additionalProperties": true
+    },
+    "actor": {
+      "$ref": "Actor.json"
+    },
     "enrichments": {
       "type": "array",
       "description": "",
@@ -29,9 +29,9 @@
     "raw_data_hash": {
       "$ref": "Fingerprint.json"
     },
-    "kernel": {
-      "type": "object",
-      "additionalProperties": true
+    "raw_data_size": {
+      "type": "integer",
+      "title": "Raw Data Size"
     }
   }
 }
\ No newline at end of file
diff --git a/components/camel-ocsf/src/main/resources/schema/KernelExtensionActivity.json b/components/camel-ocsf/src/main/resources/schema/KernelExtensionActivity.json
index 0bef7a2ddb2b..054f9f140bfe 100644
--- a/components/camel-ocsf/src/main/resources/schema/KernelExtensionActivity.json
+++ b/components/camel-ocsf/src/main/resources/schema/KernelExtensionActivity.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/classes/kernel_extension_activity",
+  "$id": "https://schema.ocsf.io/1.8.0/classes/kernel_extension_activity",
   "title": "KernelExtensionActivity",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.KernelExtensionActivity",
@@ -9,16 +9,16 @@
     "$ref": "OcsfEvent.json"
   },
   "properties": {
-    "actor": {
-      "$ref": "Actor.json"
-    },
-    "raw_data_size": {
-      "type": "integer",
-      "title": "Raw Data Size"
+    "driver": {
+      "type": "object",
+      "additionalProperties": true
     },
     "device": {
       "$ref": "Device.json"
     },
+    "actor": {
+      "$ref": "Actor.json"
+    },
     "enrichments": {
       "type": "array",
       "description": "",
@@ -26,12 +26,12 @@
         "$ref": "Enrichment.json"
       }
     },
-    "driver": {
-      "type": "object",
-      "additionalProperties": true
-    },
     "raw_data_hash": {
       "$ref": "Fingerprint.json"
+    },
+    "raw_data_size": {
+      "type": "integer",
+      "title": "Raw Data Size"
     }
   }
 }
\ No newline at end of file
diff --git a/components/camel-ocsf/src/main/resources/schema/KillChainPhase.json b/components/camel-ocsf/src/main/resources/schema/KillChainPhase.json
index 8fd705442d9f..b44492919215 100644
--- a/components/camel-ocsf/src/main/resources/schema/KillChainPhase.json
+++ b/components/camel-ocsf/src/main/resources/schema/KillChainPhase.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/kill_chain_phase",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/kill_chain_phase",
   "title": "KillChainPhase",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.KillChainPhase",
diff --git a/components/camel-ocsf/src/main/resources/schema/Location.json b/components/camel-ocsf/src/main/resources/schema/Location.json
index 009cf3d38532..def9c48ecc70 100644
--- a/components/camel-ocsf/src/main/resources/schema/Location.json
+++ b/components/camel-ocsf/src/main/resources/schema/Location.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/location",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/location",
   "title": "Location",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.Location",
@@ -55,7 +55,7 @@
     },
     "is_on_premises": {
       "type": "boolean",
-      "title": "On Premises"
+      "title": "On-Premises"
     },
     "isp": {
       "type": "string",
diff --git a/components/camel-ocsf/src/main/resources/schema/Logger.json b/components/camel-ocsf/src/main/resources/schema/Logger.json
index 2db44e5941ef..aaa163792825 100644
--- a/components/camel-ocsf/src/main/resources/schema/Logger.json
+++ b/components/camel-ocsf/src/main/resources/schema/Logger.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/logger",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/logger",
   "title": "Logger",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.Logger",
diff --git a/components/camel-ocsf/src/main/resources/schema/Malware.json b/components/camel-ocsf/src/main/resources/schema/Malware.json
index 8c97fc2702c1..824e5dfda421 100644
--- a/components/camel-ocsf/src/main/resources/schema/Malware.json
+++ b/components/camel-ocsf/src/main/resources/schema/Malware.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/malware",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/malware",
   "title": "Malware",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.Malware",
diff --git a/components/camel-ocsf/src/main/resources/schema/MemoryActivity.json b/components/camel-ocsf/src/main/resources/schema/MemoryActivity.json
index 98cd401b40e7..edcd62a90fa6 100644
--- a/components/camel-ocsf/src/main/resources/schema/MemoryActivity.json
+++ b/components/camel-ocsf/src/main/resources/schema/MemoryActivity.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/classes/memory_activity",
+  "$id": "https://schema.ocsf.io/1.8.0/classes/memory_activity",
   "title": "MemoryActivity",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.MemoryActivity",
@@ -9,44 +9,44 @@
     "$ref": "OcsfEvent.json"
   },
   "properties": {
+    "requested_permissions": {
+      "type": "integer",
+      "title": "Requested Permissions"
+    },
+    "base_address": {
+      "type": "string",
+      "title": "Base Address"
+    },
     "actor": {
       "$ref": "Actor.json"
     },
-    "raw_data_size": {
-      "type": "integer",
-      "title": "Raw Data Size"
-    },
     "device": {
       "$ref": "Device.json"
     },
-    "process": {
-      "$ref": "Process.json"
+    "actual_permissions": {
+      "type": "integer",
+      "title": "Actual Permissions"
     },
     "size": {
       "type": "integer",
       "title": "Size"
     },
-    "enrichments": {
-      "type": "array",
-      "description": "",
-      "items": {
-        "$ref": "Enrichment.json"
-      }
-    },
-    "base_address": {
-      "type": "string",
-      "title": "Base Address"
+    "process": {
+      "$ref": "Process.json"
     },
-    "actual_permissions": {
+    "raw_data_size": {
       "type": "integer",
-      "title": "Actual Permissions"
+      "title": "Raw Data Size"
     },
     "raw_data_hash": {
       "$ref": "Fingerprint.json"
     },
-    "requested_permissions": {
-      "type": "integer",
-      "title": "Requested Permissions"
+    "enrichments": {
+      "type": "array",
+      "description": "",
+      "items": {
+        "$ref": "Enrichment.json"
+      }
     }
   }
 }
\ No newline at end of file
diff --git a/components/camel-ocsf/src/main/resources/schema/Metadata.json b/components/camel-ocsf/src/main/resources/schema/Metadata.json
index 7f5258314acb..75ed3f598759 100644
--- a/components/camel-ocsf/src/main/resources/schema/Metadata.json
+++ b/components/camel-ocsf/src/main/resources/schema/Metadata.json
@@ -1,51 +1,41 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/metadata",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/metadata",
   "title": "Metadata",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.Metadata",
   "additionalProperties": true,
   "properties": {
-    "uid": {
-      "type": "string",
-      "title": "Event UID"
-    },
-    "log_format": {
-      "type": "string",
-      "title": "Log Source Format"
-    },
     "product": {
       "$ref": "Product.json"
     },
-    "log_name": {
+    "source": {
       "type": "string",
-      "title": "Log Name"
-    },
-    "extension": {
-      "$ref": "Extension.json"
-    },
-    "extensions": {
-      "type": "array",
-      "title": "Schema Extensions",
-      "items": {
-        "$ref": "Extension.json"
-      }
+      "title": "Source"
     },
-    "tenant_uid": {
+    "original_event_uid": {
       "type": "string",
-      "title": "Tenant UID"
+      "title": "Original Event ID"
     },
-    "labels": {
+    "transformation_info_list": {
       "type": "array",
-      "title": "Labels",
+      "title": "Transformation Info",
       "items": {
-        "type": "string"
+        "type": "object",
+        "additionalProperties": true
       }
     },
-    "transmit_time": {
+    "is_truncated": {
+      "type": "boolean",
+      "title": "Is Truncated"
+    },
+    "untruncated_size": {
       "type": "integer",
-      "existingJavaType": "java.lang.Long",
-      "title": "Transmission Time"
+      "title": "Untruncated Size"
+    },
+    "event_code": {
+      "type": "string",
+      "title": "Event Code"
     },
     "tags": {
       "type": "array",
@@ -55,94 +45,62 @@
         "additionalProperties": true
       }
     },
-    "source": {
-      "type": "string",
-      "title": "Source"
-    },
-    "profiles": {
-      "type": "array",
-      "title": "Profiles",
-      "items": {
-        "type": "string"
-      }
-    },
-    "correlation_uid": {
+    "log_name": {
       "type": "string",
-      "title": "Correlation UID"
+      "title": "Log Name"
     },
-    "sequence": {
+    "logged_time": {
       "type": "integer",
-      "title": "Sequence Number"
+      "existingJavaType": "java.lang.Long",
+      "title": "Logged Time"
     },
-    "log_source": {
+    "type": {
       "type": "string",
-      "title": "Log Source"
+      "title": "Type"
     },
     "log_provider": {
       "type": "string",
       "title": "Log Provider"
     },
-    "log_version": {
-      "type": "string",
-      "title": "Log Version"
-    },
-    "event_code": {
-      "type": "string",
-      "title": "Event Code"
-    },
-    "debug": {
-      "type": "array",
-      "title": "Debug Information",
-      "items": {
-        "type": "string"
-      }
-    },
-    "logged_time": {
+    "processed_time": {
       "type": "integer",
       "existingJavaType": "java.lang.Long",
-      "title": "Logged Time"
-    },
-    "reporter": {
-      "type": "object",
-      "additionalProperties": true
+      "title": "Processed Time"
     },
-    "original_time": {
-      "type": "string",
-      "title": "Original Time"
+    "extension": {
+      "$ref": "Extension.json"
     },
-    "version": {
+    "log_format": {
       "type": "string",
-      "title": "Version"
+      "title": "Log Source Format"
     },
     "modified_time": {
       "type": "integer",
       "existingJavaType": "java.lang.Long",
       "title": "Modified Time"
     },
-    "original_event_uid": {
+    "profiles": {
+      "type": "array",
+      "title": "Profiles",
+      "items": {
+        "type": "string"
+      }
+    },
+    "tenant_uid": {
       "type": "string",
-      "title": "Original Event ID"
+      "title": "Tenant UID"
     },
-    "transformation_info_list": {
+    "extensions": {
       "type": "array",
-      "title": "Transformation Info",
+      "title": "Schema Extensions",
       "items": {
-        "type": "object",
-        "additionalProperties": true
+        "$ref": "Extension.json"
       }
     },
-    "is_truncated": {
-      "type": "boolean",
-      "title": "Is Truncated"
-    },
-    "processed_time": {
+    "transmit_time": {
       "type": "integer",
       "existingJavaType": "java.lang.Long",
-      "title": "Processed Time"
-    },
-    "type": {
-      "type": "string",
-      "title": "Type"
+      "title": "Transmission Time"
     },
     "loggers": {
       "type": "array",
@@ -151,13 +109,59 @@
         "$ref": "Logger.json"
       }
     },
-    "untruncated_size": {
-      "type": "integer",
-      "title": "Untruncated Size"
+    "version": {
+      "type": "string",
+      "title": "Version"
+    },
+    "debug": {
+      "type": "array",
+      "title": "Debug Information",
+      "items": {
+        "type": "string"
+      }
     },
     "log_level": {
       "type": "string",
       "title": "Log Level"
+    },
+    "sequence": {
+      "type": "integer",
+      "title": "Sequence Number"
+    },
+    "total_queued_duration": {
+      "type": "object",
+      "additionalProperties": true
+    },
+    "labels": {
+      "type": "array",
+      "title": "Labels",
+      "items": {
+        "type": "string"
+      }
+    },
+    "log_version": {
+      "type": "string",
+      "title": "Log Version"
+    },
+    "correlation_uid": {
+      "type": "string",
+      "title": "Correlation UID"
+    },
+    "uid": {
+      "type": "string",
+      "title": "Event UID"
+    },
+    "original_time": {
+      "type": "string",
+      "title": "Original Time"
+    },
+    "reporter": {
+      "type": "object",
+      "additionalProperties": true
+    },
+    "log_source": {
+      "type": "string",
+      "title": "Log Source"
     }
   },
   "description": "The Metadata object."
diff --git a/components/camel-ocsf/src/main/resources/schema/Module.json b/components/camel-ocsf/src/main/resources/schema/Module.json
index fa3df1537caa..4ac2f175504f 100644
--- a/components/camel-ocsf/src/main/resources/schema/Module.json
+++ b/components/camel-ocsf/src/main/resources/schema/Module.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/module",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/module",
   "title": "Module",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.Module",
diff --git a/components/camel-ocsf/src/main/resources/schema/ModuleActivity.json b/components/camel-ocsf/src/main/resources/schema/ModuleActivity.json
index 8a040e5910f1..f3377784ecea 100644
--- a/components/camel-ocsf/src/main/resources/schema/ModuleActivity.json
+++ b/components/camel-ocsf/src/main/resources/schema/ModuleActivity.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/classes/module_activity",
+  "$id": "https://schema.ocsf.io/1.8.0/classes/module_activity",
   "title": "ModuleActivity",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.ModuleActivity",
@@ -9,16 +9,15 @@
     "$ref": "OcsfEvent.json"
   },
   "properties": {
-    "actor": {
-      "$ref": "Actor.json"
-    },
-    "raw_data_size": {
-      "type": "integer",
-      "title": "Raw Data Size"
+    "module": {
+      "$ref": "Module.json"
     },
     "device": {
       "$ref": "Device.json"
     },
+    "actor": {
+      "$ref": "Actor.json"
+    },
     "enrichments": {
       "type": "array",
       "description": "",
@@ -26,11 +25,12 @@
         "$ref": "Enrichment.json"
       }
     },
-    "module": {
-      "$ref": "Module.json"
-    },
     "raw_data_hash": {
       "$ref": "Fingerprint.json"
+    },
+    "raw_data_size": {
+      "type": "integer",
+      "title": "Raw Data Size"
     }
   }
 }
\ No newline at end of file
diff --git a/components/camel-ocsf/src/main/resources/schema/NetworkActivity.json b/components/camel-ocsf/src/main/resources/schema/NetworkActivity.json
index 0a66486e91df..2ff60c963502 100644
--- a/components/camel-ocsf/src/main/resources/schema/NetworkActivity.json
+++ b/components/camel-ocsf/src/main/resources/schema/NetworkActivity.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/classes/network_activity",
+  "$id": "https://schema.ocsf.io/1.8.0/classes/network_activity",
   "title": "NetworkActivity",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.NetworkActivity",
@@ -9,55 +9,62 @@
     "$ref": "OcsfEvent.json"
   },
   "properties": {
-    "cumulative_traffic": {
-      "type": "object",
-      "additionalProperties": true
+    "ja4_fingerprint_list": {
+      "type": "array",
+      "title": "JA4+ Fingerprints",
+      "items": {
+        "$ref": "Ja4Fingerprint.json"
+      }
     },
-    "connection_info": {
+    "observation_point": {
+      "type": "string",
+      "title": "Observation Point"
+    },
+    "src_endpoint": {
+      "$ref": "NetworkEndpoint.json"
+    },
+    "tls": {
+      "$ref": "Tls.json"
+    },
+    "is_src_dst_assignment_known": {
+      "type": "boolean",
+      "title": "Source/Destination Assignment Known"
+    },
+    "cumulative_traffic": {
       "type": "object",
       "additionalProperties": true
     },
-    "raw_data_size": {
-      "type": "integer",
-      "title": "Raw Data Size"
+    "dst_endpoint": {
+      "$ref": "NetworkEndpoint.json"
     },
-    "enrichments": {
+    "packet_list": {
       "type": "array",
       "description": "",
       "items": {
-        "$ref": "Enrichment.json"
+        "$ref": "Packet.json"
       }
     },
-    "traffic": {
+    "connection_info": {
       "type": "object",
       "additionalProperties": true
     },
-    "src_endpoint": {
-      "$ref": "NetworkEndpoint.json"
-    },
     "app_name": {
       "type": "string",
       "title": "Application Name"
     },
-    "dst_endpoint": {
-      "$ref": "NetworkEndpoint.json"
-    },
-    "raw_data_hash": {
-      "$ref": "Fingerprint.json"
-    },
-    "ja4_fingerprint_list": {
-      "type": "array",
-      "title": "JA4+ Fingerprints",
-      "items": {
-        "$ref": "Ja4Fingerprint.json"
-      }
-    },
     "url": {
       "$ref": "Url.json"
     },
-    "is_src_dst_assignment_known": {
-      "type": "boolean",
-      "title": "Source/Destination Assignment Known"
+    "traffic": {
+      "type": "object",
+      "additionalProperties": true
+    },
+    "network_observation_point": {
+      "$ref": "NetworkEndpoint.json"
+    },
+    "app_protocol_name": {
+      "type": "string",
+      "title": "Application Protocol Name"
     },
     "observation_point_id": {
       "type": "integer",
@@ -67,12 +74,19 @@
       "type": "object",
       "additionalProperties": true
     },
-    "observation_point": {
-      "type": "string",
-      "title": "Observation Point"
+    "raw_data_size": {
+      "type": "integer",
+      "title": "Raw Data Size"
     },
-    "tls": {
-      "$ref": "Tls.json"
+    "raw_data_hash": {
+      "$ref": "Fingerprint.json"
+    },
+    "enrichments": {
+      "type": "array",
+      "description": "",
+      "items": {
+        "$ref": "Enrichment.json"
+      }
     }
   }
 }
\ No newline at end of file
diff --git a/components/camel-ocsf/src/main/resources/schema/NetworkEndpoint.json b/components/camel-ocsf/src/main/resources/schema/NetworkEndpoint.json
index 8ec3c1a6d893..1d5cec75dd07 100644
--- a/components/camel-ocsf/src/main/resources/schema/NetworkEndpoint.json
+++ b/components/camel-ocsf/src/main/resources/schema/NetworkEndpoint.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/network_endpoint",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/network_endpoint",
   "title": "NetworkEndpoint",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.NetworkEndpoint",
@@ -35,22 +35,32 @@
       "title": "IP Address",
       "pattern": "((^\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]).){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\s*$)|(^\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa- [...]
     },
+    "pool": {
+      "$ref": "Group.json"
+    },
     "location": {
       "$ref": "Location.json"
     },
-    "hostname": {
-      "type": "string",
-      "title": "Hostname"
-    },
     "uid": {
       "type": "string",
       "title": "Unique ID"
     },
+    "hostname": {
+      "type": "string",
+      "title": "Hostname"
+    },
     "mac": {
       "type": "string",
       "title": "MAC Address",
       "pattern": "^([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})$"
     },
+    "fingerprints": {
+      "type": "array",
+      "title": "Fingerprints",
+      "items": {
+        "$ref": "Fingerprint.json"
+      }
+    },
     "type_id": {
       "type": "integer",
       "title": "Type ID"
@@ -98,6 +108,10 @@
       "type": "string",
       "title": "ISP Org"
     },
+    "mac_vendor": {
+      "type": "string",
+      "title": "MAC Vendor"
+    },
     "network_scope": {
       "type": "string",
       "title": "Network Scope"
diff --git a/components/camel-ocsf/src/main/resources/schema/NetworkFileActivity.json b/components/camel-ocsf/src/main/resources/schema/NetworkFileActivity.json
index 99017f660999..885421d9c2fa 100644
--- a/components/camel-ocsf/src/main/resources/schema/NetworkFileActivity.json
+++ b/components/camel-ocsf/src/main/resources/schema/NetworkFileActivity.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/classes/network_file_activity",
+  "$id": "https://schema.ocsf.io/1.8.0/classes/network_file_activity",
   "title": "NetworkFileActivity",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.NetworkFileActivity",
@@ -9,60 +9,64 @@
     "$ref": "OcsfEvent.json"
   },
   "properties": {
-    "cumulative_traffic": {
-      "type": "object",
-      "additionalProperties": true
+    "ja4_fingerprint_list": {
+      "type": "array",
+      "title": "JA4+ Fingerprints",
+      "items": {
+        "$ref": "Ja4Fingerprint.json"
+      }
+    },
+    "observation_point": {
+      "type": "string",
+      "title": "Observation Point"
+    },
+    "src_endpoint": {
+      "$ref": "NetworkEndpoint.json"
+    },
+    "tls": {
+      "$ref": "Tls.json"
     },
     "actor": {
       "$ref": "Actor.json"
     },
-    "connection_info": {
+    "cumulative_traffic": {
       "type": "object",
       "additionalProperties": true
     },
-    "raw_data_size": {
-      "type": "integer",
-      "title": "Raw Data Size"
-    },
-    "file": {
-      "$ref": "File.json"
+    "dst_endpoint": {
+      "$ref": "NetworkEndpoint.json"
     },
-    "enrichments": {
+    "packet_list": {
       "type": "array",
       "description": "",
       "items": {
-        "$ref": "Enrichment.json"
+        "$ref": "Packet.json"
       }
     },
-    "traffic": {
+    "connection_info": {
       "type": "object",
       "additionalProperties": true
     },
-    "src_endpoint": {
-      "$ref": "NetworkEndpoint.json"
-    },
     "app_name": {
       "type": "string",
       "title": "Application Name"
     },
-    "dst_endpoint": {
-      "$ref": "NetworkEndpoint.json"
-    },
-    "raw_data_hash": {
-      "$ref": "Fingerprint.json"
-    },
-    "ja4_fingerprint_list": {
-      "type": "array",
-      "title": "JA4+ Fingerprints",
-      "items": {
-        "$ref": "Ja4Fingerprint.json"
-      }
+    "traffic": {
+      "type": "object",
+      "additionalProperties": true
     },
     "expiration_time": {
       "type": "integer",
       "existingJavaType": "java.lang.Long",
       "title": "Expiration Time"
     },
+    "network_observation_point": {
+      "$ref": "NetworkEndpoint.json"
+    },
+    "app_protocol_name": {
+      "type": "string",
+      "title": "Application Protocol Name"
+    },
     "observation_point_id": {
       "type": "integer",
       "title": "Observation Point ID"
@@ -71,12 +75,22 @@
       "type": "object",
       "additionalProperties": true
     },
-    "observation_point": {
-      "type": "string",
-      "title": "Observation Point"
+    "raw_data_size": {
+      "type": "integer",
+      "title": "Raw Data Size"
     },
-    "tls": {
-      "$ref": "Tls.json"
+    "raw_data_hash": {
+      "$ref": "Fingerprint.json"
+    },
+    "file": {
+      "$ref": "File.json"
+    },
+    "enrichments": {
+      "type": "array",
+      "description": "",
+      "items": {
+        "$ref": "Enrichment.json"
+      }
     }
   }
 }
\ No newline at end of file
diff --git a/components/camel-ocsf/src/main/resources/schema/NetworkInterface.json b/components/camel-ocsf/src/main/resources/schema/NetworkInterface.json
index da8f87005fe5..984b8c1502cb 100644
--- a/components/camel-ocsf/src/main/resources/schema/NetworkInterface.json
+++ b/components/camel-ocsf/src/main/resources/schema/NetworkInterface.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/network_interface",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/network_interface",
   "title": "NetworkInterface",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.NetworkInterface",
@@ -19,14 +19,14 @@
       "title": "IP Address",
       "pattern": "((^\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]).){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\s*$)|(^\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa- [...]
     },
-    "hostname": {
-      "type": "string",
-      "title": "Hostname"
-    },
     "uid": {
       "type": "string",
       "title": "Unique ID"
     },
+    "hostname": {
+      "type": "string",
+      "title": "Hostname"
+    },
     "mac": {
       "type": "string",
       "title": "MAC Address",
diff --git a/components/camel-ocsf/src/main/resources/schema/NtpActivity.json b/components/camel-ocsf/src/main/resources/schema/NtpActivity.json
index 762b5c2043ac..db4a95eccd3e 100644
--- a/components/camel-ocsf/src/main/resources/schema/NtpActivity.json
+++ b/components/camel-ocsf/src/main/resources/schema/NtpActivity.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/classes/ntp_activity",
+  "$id": "https://schema.ocsf.io/1.8.0/classes/ntp_activity",
   "title": "NtpActivity",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.NtpActivity",
@@ -9,83 +9,97 @@
     "$ref": "OcsfEvent.json"
   },
   "properties": {
-    "cumulative_traffic": {
-      "type": "object",
-      "additionalProperties": true
+    "ja4_fingerprint_list": {
+      "type": "array",
+      "title": "JA4+ Fingerprints",
+      "items": {
+        "$ref": "Ja4Fingerprint.json"
+      }
     },
-    "precision": {
-      "type": "integer",
-      "title": "Precision"
+    "observation_point": {
+      "type": "string",
+      "title": "Observation Point"
     },
-    "connection_info": {
+    "src_endpoint": {
+      "$ref": "NetworkEndpoint.json"
+    },
+    "tls": {
+      "$ref": "Tls.json"
+    },
+    "cumulative_traffic": {
       "type": "object",
       "additionalProperties": true
     },
-    "raw_data_size": {
-      "type": "integer",
-      "title": "Raw Data Size"
-    },
-    "delay": {
-      "type": "integer",
-      "title": "Root Delay"
+    "dst_endpoint": {
+      "$ref": "NetworkEndpoint.json"
     },
-    "enrichments": {
+    "packet_list": {
       "type": "array",
       "description": "",
       "items": {
-        "$ref": "Enrichment.json"
+        "$ref": "Packet.json"
       }
     },
-    "traffic": {
+    "connection_info": {
       "type": "object",
       "additionalProperties": true
     },
-    "src_endpoint": {
-      "$ref": "NetworkEndpoint.json"
-    },
     "app_name": {
       "type": "string",
       "title": "Application Name"
     },
-    "dst_endpoint": {
-      "$ref": "NetworkEndpoint.json"
-    },
-    "raw_data_hash": {
-      "$ref": "Fingerprint.json"
-    },
-    "ja4_fingerprint_list": {
-      "type": "array",
-      "title": "JA4+ Fingerprints",
-      "items": {
-        "$ref": "Ja4Fingerprint.json"
-      }
+    "precision": {
+      "type": "integer",
+      "title": "Precision"
     },
-    "observation_point_id": {
+    "stratum_id": {
       "type": "integer",
-      "title": "Observation Point ID"
+      "title": "Stratum ID"
+    },
+    "traffic": {
+      "type": "object",
+      "additionalProperties": true
     },
     "stratum": {
       "type": "string",
       "title": "Stratum"
     },
-    "proxy": {
-      "type": "object",
-      "additionalProperties": true
+    "network_observation_point": {
+      "$ref": "NetworkEndpoint.json"
     },
-    "observation_point": {
+    "delay": {
+      "type": "integer",
+      "title": "Root Delay"
+    },
+    "app_protocol_name": {
       "type": "string",
-      "title": "Observation Point"
+      "title": "Application Protocol Name"
     },
     "dispersion": {
       "type": "integer",
       "title": "Root Dispersion"
     },
-    "tls": {
-      "$ref": "Tls.json"
+    "observation_point_id": {
+      "type": "integer",
+      "title": "Observation Point ID"
     },
-    "stratum_id": {
+    "proxy": {
+      "type": "object",
+      "additionalProperties": true
+    },
+    "raw_data_size": {
       "type": "integer",
-      "title": "Stratum ID"
+      "title": "Raw Data Size"
+    },
+    "raw_data_hash": {
+      "$ref": "Fingerprint.json"
+    },
+    "enrichments": {
+      "type": "array",
+      "description": "",
+      "items": {
+        "$ref": "Enrichment.json"
+      }
     }
   }
 }
\ No newline at end of file
diff --git a/components/camel-ocsf/src/main/resources/schema/Observable.json b/components/camel-ocsf/src/main/resources/schema/Observable.json
index bcfcbc46cd7f..f4bfc8d1c868 100644
--- a/components/camel-ocsf/src/main/resources/schema/Observable.json
+++ b/components/camel-ocsf/src/main/resources/schema/Observable.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/observable",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/observable",
   "title": "Observable",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.Observable",
diff --git a/components/camel-ocsf/src/main/resources/schema/OcsfEvent.json b/components/camel-ocsf/src/main/resources/schema/OcsfEvent.json
index ea67f7621ab0..58c00b549ae3 100644
--- a/components/camel-ocsf/src/main/resources/schema/OcsfEvent.json
+++ b/components/camel-ocsf/src/main/resources/schema/OcsfEvent.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/base_event",
+  "$id": "https://schema.ocsf.io/1.8.0/base_event",
   "title": "OcsfEvent",
   "description": "Base OCSF Event - contains common attributes shared by all event classes",
   "type": "object",
diff --git a/components/camel-ocsf/src/main/resources/schema/Organization.json b/components/camel-ocsf/src/main/resources/schema/Organization.json
index 006a3aab2954..0d5edb305e42 100644
--- a/components/camel-ocsf/src/main/resources/schema/Organization.json
+++ b/components/camel-ocsf/src/main/resources/schema/Organization.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/organization",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/organization",
   "title": "Organization",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.Organization",
diff --git a/components/camel-ocsf/src/main/resources/schema/Os.json b/components/camel-ocsf/src/main/resources/schema/Os.json
index 3ef6b8e6c6d7..676963196d5b 100644
--- a/components/camel-ocsf/src/main/resources/schema/Os.json
+++ b/components/camel-ocsf/src/main/resources/schema/Os.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/os",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/os",
   "title": "Os",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.Os",
@@ -26,14 +26,14 @@
       "type": "string",
       "title": "Country"
     },
-    "type_id": {
-      "type": "integer",
-      "title": "Type ID"
-    },
     "lang": {
       "type": "string",
       "title": "Language"
     },
+    "type_id": {
+      "type": "integer",
+      "title": "Type ID"
+    },
     "cpe_name": {
       "type": "string",
       "title": "The product CPE identifier"
diff --git a/components/camel-ocsf/src/main/resources/schema/Package.json b/components/camel-ocsf/src/main/resources/schema/Package.json
index ab878176b729..1bfaa2f00e3d 100644
--- a/components/camel-ocsf/src/main/resources/schema/Package.json
+++ b/components/camel-ocsf/src/main/resources/schema/Package.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/package",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/package",
   "title": "Package",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.Package",
diff --git a/components/camel-ocsf/src/main/resources/schema/Packet.json b/components/camel-ocsf/src/main/resources/schema/Packet.json
new file mode 100644
index 000000000000..1204f0ff0d42
--- /dev/null
+++ b/components/camel-ocsf/src/main/resources/schema/Packet.json
@@ -0,0 +1,51 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/packet",
+  "title": "Packet",
+  "type": "object",
+  "javaType": "org.apache.camel.dataformat.ocsf.model.Packet",
+  "additionalProperties": true,
+  "properties": {
+    "value": {
+      "type": "string",
+      "title": "Value"
+    },
+    "format": {
+      "type": "string",
+      "title": "Format"
+    },
+    "encoding": {
+      "type": "string",
+      "title": "Encoding"
+    },
+    "source": {
+      "type": "string",
+      "title": "Source"
+    },
+    "sequence_number": {
+      "type": "integer",
+      "title": "Sequence Number"
+    },
+    "encoding_id": {
+      "type": "integer",
+      "title": "Encoding ID"
+    },
+    "end_offset": {
+      "type": "integer",
+      "title": "End Offset"
+    },
+    "format_id": {
+      "type": "integer",
+      "title": "Format ID"
+    },
+    "source_id": {
+      "type": "integer",
+      "title": "Source ID"
+    },
+    "start_offset": {
+      "type": "integer",
+      "title": "Start Offset"
+    }
+  },
+  "description": "The Packet object."
+}
\ No newline at end of file
diff --git a/components/camel-ocsf/src/main/resources/schema/Policy.json b/components/camel-ocsf/src/main/resources/schema/Policy.json
index f9548b4942a0..68d328f7d94b 100644
--- a/components/camel-ocsf/src/main/resources/schema/Policy.json
+++ b/components/camel-ocsf/src/main/resources/schema/Policy.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/policy",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/policy",
   "title": "Policy",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.Policy",
diff --git a/components/camel-ocsf/src/main/resources/schema/Process.json b/components/camel-ocsf/src/main/resources/schema/Process.json
index 84396bbe680a..3c98e5769d87 100644
--- a/components/camel-ocsf/src/main/resources/schema/Process.json
+++ b/components/camel-ocsf/src/main/resources/schema/Process.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/process",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/process",
   "title": "Process",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.Process",
diff --git a/components/camel-ocsf/src/main/resources/schema/ProcessActivity.json b/components/camel-ocsf/src/main/resources/schema/ProcessActivity.json
index 20fdbc5e167c..c21c543b5ee4 100644
--- a/components/camel-ocsf/src/main/resources/schema/ProcessActivity.json
+++ b/components/camel-ocsf/src/main/resources/schema/ProcessActivity.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/classes/process_activity",
+  "$id": "https://schema.ocsf.io/1.8.0/classes/process_activity",
   "title": "ProcessActivity",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.ProcessActivity",
@@ -9,59 +9,59 @@
     "$ref": "OcsfEvent.json"
   },
   "properties": {
-    "actor": {
-      "$ref": "Actor.json"
-    },
-    "raw_data_size": {
+    "requested_permissions": {
       "type": "integer",
-      "title": "Raw Data Size"
-    },
-    "device": {
-      "$ref": "Device.json"
-    },
-    "process": {
-      "$ref": "Process.json"
+      "title": "Requested Permissions"
     },
-    "enrichments": {
-      "type": "array",
-      "description": "",
-      "items": {
-        "$ref": "Enrichment.json"
-      }
+    "actor": {
+      "$ref": "Actor.json"
     },
     "module": {
       "$ref": "Module.json"
     },
-    "exit_code": {
-      "type": "integer",
-      "title": "Exit Code"
-    },
-    "actual_permissions": {
-      "type": "integer",
-      "title": "Actual Permissions"
-    },
     "injection_type_id": {
       "type": "integer",
       "title": "Injection Type ID"
     },
-    "raw_data_hash": {
-      "$ref": "Fingerprint.json"
+    "exit_code": {
+      "type": "integer",
+      "title": "Exit Code"
+    },
+    "device": {
+      "$ref": "Device.json"
     },
     "launch_type_id": {
       "type": "integer",
       "title": "Launch Type ID"
     },
+    "actual_permissions": {
+      "type": "integer",
+      "title": "Actual Permissions"
+    },
+    "process": {
+      "$ref": "Process.json"
+    },
     "injection_type": {
       "type": "string",
       "title": "Injection Type"
     },
-    "requested_permissions": {
-      "type": "integer",
-      "title": "Requested Permissions"
-    },
     "launch_type": {
       "type": "string",
       "title": "Launch Type"
+    },
+    "raw_data_size": {
+      "type": "integer",
+      "title": "Raw Data Size"
+    },
+    "raw_data_hash": {
+      "$ref": "Fingerprint.json"
+    },
+    "enrichments": {
+      "type": "array",
+      "description": "",
+      "items": {
+        "$ref": "Enrichment.json"
+      }
     }
   }
 }
\ No newline at end of file
diff --git a/components/camel-ocsf/src/main/resources/schema/Product.json b/components/camel-ocsf/src/main/resources/schema/Product.json
index 8081b6694fc8..651fe37fb442 100644
--- a/components/camel-ocsf/src/main/resources/schema/Product.json
+++ b/components/camel-ocsf/src/main/resources/schema/Product.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/product",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/product",
   "title": "Product",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.Product",
diff --git a/components/camel-ocsf/src/main/resources/schema/RdpActivity.json b/components/camel-ocsf/src/main/resources/schema/RdpActivity.json
index 2695b8e63c3d..6c3d5ef10de2 100644
--- a/components/camel-ocsf/src/main/resources/schema/RdpActivity.json
+++ b/components/camel-ocsf/src/main/resources/schema/RdpActivity.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/classes/rdp_activity",
+  "$id": "https://schema.ocsf.io/1.8.0/classes/rdp_activity",
   "title": "RdpActivity",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.RdpActivity",
@@ -9,60 +9,23 @@
     "$ref": "OcsfEvent.json"
   },
   "properties": {
-    "cumulative_traffic": {
-      "type": "object",
-      "additionalProperties": true
-    },
-    "connection_info": {
-      "type": "object",
-      "additionalProperties": true
-    },
-    "keyboard_info": {
-      "type": "object",
-      "additionalProperties": true
-    },
-    "raw_data_size": {
-      "type": "integer",
-      "title": "Raw Data Size"
-    },
-    "protocol_ver": {
-      "type": "string",
-      "title": "RDP Version"
-    },
-    "device": {
-      "$ref": "Device.json"
-    },
     "remote_display": {
       "$ref": "Display.json"
     },
-    "file": {
-      "$ref": "File.json"
-    },
-    "enrichments": {
+    "ja4_fingerprint_list": {
       "type": "array",
-      "description": "",
+      "title": "JA4+ Fingerprints",
       "items": {
-        "$ref": "Enrichment.json"
+        "$ref": "Ja4Fingerprint.json"
       }
     },
-    "traffic": {
-      "type": "object",
-      "additionalProperties": true
-    },
-    "capabilities": {
-      "type": "array",
-      "title": "Capabilities",
-      "items": {
-        "type": "string"
-      }
+    "observation_point": {
+      "type": "string",
+      "title": "Observation Point"
     },
     "src_endpoint": {
       "$ref": "NetworkEndpoint.json"
     },
-    "app_name": {
-      "type": "string",
-      "title": "Application Name"
-    },
     "identifier_cookie": {
       "type": "string",
       "title": "Identifier Cookie"
@@ -70,6 +33,20 @@
     "user": {
       "$ref": "User.json"
     },
+    "tls": {
+      "$ref": "Tls.json"
+    },
+    "protocol_ver": {
+      "type": "string",
+      "title": "RDP Version"
+    },
+    "cumulative_traffic": {
+      "type": "object",
+      "additionalProperties": true
+    },
+    "response": {
+      "$ref": "Response.json"
+    },
     "certificate_chain": {
       "type": "array",
       "title": "Certificate Chain",
@@ -77,25 +54,52 @@
         "type": "string"
       }
     },
+    "keyboard_info": {
+      "type": "object",
+      "additionalProperties": true
+    },
     "dst_endpoint": {
       "$ref": "NetworkEndpoint.json"
     },
-    "response": {
-      "$ref": "Response.json"
+    "packet_list": {
+      "type": "array",
+      "description": "",
+      "items": {
+        "$ref": "Packet.json"
+      }
     },
-    "raw_data_hash": {
-      "$ref": "Fingerprint.json"
+    "connection_info": {
+      "type": "object",
+      "additionalProperties": true
     },
-    "ja4_fingerprint_list": {
+    "capabilities": {
       "type": "array",
-      "title": "JA4+ Fingerprints",
+      "title": "Capabilities",
       "items": {
-        "$ref": "Ja4Fingerprint.json"
+        "type": "string"
       }
     },
+    "device": {
+      "$ref": "Device.json"
+    },
+    "app_name": {
+      "type": "string",
+      "title": "Application Name"
+    },
+    "traffic": {
+      "type": "object",
+      "additionalProperties": true
+    },
+    "network_observation_point": {
+      "$ref": "NetworkEndpoint.json"
+    },
     "request": {
       "$ref": "Request.json"
     },
+    "app_protocol_name": {
+      "type": "string",
+      "title": "Application Protocol Name"
+    },
     "observation_point_id": {
       "type": "integer",
       "title": "Observation Point ID"
@@ -104,12 +108,22 @@
       "type": "object",
       "additionalProperties": true
     },
-    "observation_point": {
-      "type": "string",
-      "title": "Observation Point"
+    "raw_data_size": {
+      "type": "integer",
+      "title": "Raw Data Size"
     },
-    "tls": {
-      "$ref": "Tls.json"
+    "raw_data_hash": {
+      "$ref": "Fingerprint.json"
+    },
+    "file": {
+      "$ref": "File.json"
+    },
+    "enrichments": {
+      "type": "array",
+      "description": "",
+      "items": {
+        "$ref": "Enrichment.json"
+      }
     }
   }
 }
\ No newline at end of file
diff --git a/components/camel-ocsf/src/main/resources/schema/Remediation.json b/components/camel-ocsf/src/main/resources/schema/Remediation.json
index 30dea8483247..8947a4a8c646 100644
--- a/components/camel-ocsf/src/main/resources/schema/Remediation.json
+++ b/components/camel-ocsf/src/main/resources/schema/Remediation.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/remediation",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/remediation",
   "title": "Remediation",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.Remediation",
diff --git a/components/camel-ocsf/src/main/resources/schema/RemediationActivity.json b/components/camel-ocsf/src/main/resources/schema/RemediationActivity.json
index b2f91c373e1b..ef4552fcfcde 100644
--- a/components/camel-ocsf/src/main/resources/schema/RemediationActivity.json
+++ b/components/camel-ocsf/src/main/resources/schema/RemediationActivity.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/classes/remediation_activity",
+  "$id": "https://schema.ocsf.io/1.8.0/classes/remediation_activity",
   "title": "RemediationActivity",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.RemediationActivity",
@@ -9,27 +9,16 @@
     "$ref": "OcsfEvent.json"
   },
   "properties": {
-    "raw_data_size": {
-      "type": "integer",
-      "title": "Raw Data Size"
-    },
-    "enrichments": {
-      "type": "array",
-      "description": "",
-      "items": {
-        "$ref": "Enrichment.json"
-      }
-    },
     "scan": {
       "$ref": "Scan.json"
     },
+    "remediation": {
+      "$ref": "Remediation.json"
+    },
     "command_uid": {
       "type": "string",
       "title": "Command UID"
     },
-    "remediation": {
-      "$ref": "Remediation.json"
-    },
     "countermeasures": {
       "type": "array",
       "title": "Countermeasures",
@@ -38,8 +27,19 @@
         "additionalProperties": true
       }
     },
+    "enrichments": {
+      "type": "array",
+      "description": "",
+      "items": {
+        "$ref": "Enrichment.json"
+      }
+    },
     "raw_data_hash": {
       "$ref": "Fingerprint.json"
+    },
+    "raw_data_size": {
+      "type": "integer",
+      "title": "Raw Data Size"
     }
   }
 }
\ No newline at end of file
diff --git a/components/camel-ocsf/src/main/resources/schema/Reputation.json b/components/camel-ocsf/src/main/resources/schema/Reputation.json
index bc167d7c718f..7340987e9285 100644
--- a/components/camel-ocsf/src/main/resources/schema/Reputation.json
+++ b/components/camel-ocsf/src/main/resources/schema/Reputation.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/reputation",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/reputation",
   "title": "Reputation",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.Reputation",
diff --git a/components/camel-ocsf/src/main/resources/schema/Request.json b/components/camel-ocsf/src/main/resources/schema/Request.json
index 04a545254a6f..91eecbcda2b7 100644
--- a/components/camel-ocsf/src/main/resources/schema/Request.json
+++ b/components/camel-ocsf/src/main/resources/schema/Request.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/request",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/request",
   "title": "Request",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.Request",
diff --git a/components/camel-ocsf/src/main/resources/schema/ResourceDetails.json b/components/camel-ocsf/src/main/resources/schema/ResourceDetails.json
index c64fbcb5052d..fd938e31999f 100644
--- a/components/camel-ocsf/src/main/resources/schema/ResourceDetails.json
+++ b/components/camel-ocsf/src/main/resources/schema/ResourceDetails.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/resource_details",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/resource_details",
   "title": "ResourceDetails",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.ResourceDetails",
@@ -41,14 +41,14 @@
     "group": {
       "$ref": "Group.json"
     },
-    "hostname": {
-      "type": "string",
-      "title": "Hostname"
-    },
     "uid": {
       "type": "string",
       "title": "Unique ID"
     },
+    "hostname": {
+      "type": "string",
+      "title": "Hostname"
+    },
     "labels": {
       "type": "array",
       "title": "Labels",
diff --git a/components/camel-ocsf/src/main/resources/schema/Response.json b/components/camel-ocsf/src/main/resources/schema/Response.json
index a69c37874d22..911e1ef6ca1b 100644
--- a/components/camel-ocsf/src/main/resources/schema/Response.json
+++ b/components/camel-ocsf/src/main/resources/schema/Response.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/response",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/response",
   "title": "Response",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.Response",
diff --git a/components/camel-ocsf/src/main/resources/schema/Rule.json b/components/camel-ocsf/src/main/resources/schema/Rule.json
index e400e5f8bcfb..3c89a866cf12 100644
--- a/components/camel-ocsf/src/main/resources/schema/Rule.json
+++ b/components/camel-ocsf/src/main/resources/schema/Rule.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/rule",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/rule",
   "title": "Rule",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.Rule",
diff --git a/components/camel-ocsf/src/main/resources/schema/San.json b/components/camel-ocsf/src/main/resources/schema/San.json
index 7db092ebb24b..df57976a1465 100644
--- a/components/camel-ocsf/src/main/resources/schema/San.json
+++ b/components/camel-ocsf/src/main/resources/schema/San.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/san",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/san",
   "title": "San",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.San",
diff --git a/components/camel-ocsf/src/main/resources/schema/Scan.json b/components/camel-ocsf/src/main/resources/schema/Scan.json
index d39d3480c142..7ebf27cb6a3e 100644
--- a/components/camel-ocsf/src/main/resources/schema/Scan.json
+++ b/components/camel-ocsf/src/main/resources/schema/Scan.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/scan",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/scan",
   "title": "Scan",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.Scan",
diff --git a/components/camel-ocsf/src/main/resources/schema/ScanActivity.json b/components/camel-ocsf/src/main/resources/schema/ScanActivity.json
index 0e89db352aab..5e7b87207fa0 100644
--- a/components/camel-ocsf/src/main/resources/schema/ScanActivity.json
+++ b/components/camel-ocsf/src/main/resources/schema/ScanActivity.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/classes/scan_activity",
+  "$id": "https://schema.ocsf.io/1.8.0/classes/scan_activity",
   "title": "ScanActivity",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.ScanActivity",
@@ -9,73 +9,73 @@
     "$ref": "OcsfEvent.json"
   },
   "properties": {
+    "num_folders": {
+      "type": "integer",
+      "title": "Scanned Folders"
+    },
     "schedule_uid": {
       "type": "string",
       "title": "Schedule UID"
     },
-    "total": {
+    "num_trusted_items": {
       "type": "integer",
-      "title": "Total"
+      "title": "Trusted"
     },
-    "raw_data_size": {
+    "num_detections": {
       "type": "integer",
-      "title": "Raw Data Size"
+      "title": "Detections"
     },
     "num_processes": {
       "type": "integer",
       "title": "Scanned Processes"
     },
-    "num_skipped_items": {
+    "num_network_items": {
       "type": "integer",
-      "title": "Skipped"
+      "title": "Scanned Network Items"
     },
-    "num_registry_items": {
+    "num_files": {
       "type": "integer",
-      "title": "Scanned Registry Items"
+      "title": "Scanned Files"
     },
-    "enrichments": {
-      "type": "array",
-      "description": "",
-      "items": {
-        "$ref": "Enrichment.json"
-      }
+    "command_uid": {
+      "type": "string",
+      "title": "Command UID"
+    },
+    "num_skipped_items": {
+      "type": "integer",
+      "title": "Skipped"
     },
     "scan": {
       "$ref": "Scan.json"
     },
-    "num_resolutions": {
-      "type": "integer",
-      "title": "Resolutions"
+    "policy": {
+      "$ref": "Policy.json"
     },
-    "num_network_items": {
+    "total": {
       "type": "integer",
-      "title": "Scanned Network Items"
+      "title": "Total"
     },
-    "command_uid": {
-      "type": "string",
-      "title": "Command UID"
+    "num_resolutions": {
+      "type": "integer",
+      "title": "Resolutions"
     },
-    "num_files": {
+    "raw_data_size": {
       "type": "integer",
-      "title": "Scanned Files"
+      "title": "Raw Data Size"
     },
     "raw_data_hash": {
       "$ref": "Fingerprint.json"
     },
-    "num_trusted_items": {
-      "type": "integer",
-      "title": "Trusted"
-    },
-    "policy": {
-      "$ref": "Policy.json"
-    },
-    "num_detections": {
-      "type": "integer",
-      "title": "Detections"
+    "enrichments": {
+      "type": "array",
+      "description": "",
+      "items": {
+        "$ref": "Enrichment.json"
+      }
     },
-    "num_folders": {
+    "num_registry_items": {
       "type": "integer",
-      "title": "Scanned Folders"
+      "title": "Scanned Registry Items"
     }
   }
 }
\ No newline at end of file
diff --git a/components/camel-ocsf/src/main/resources/schema/ScheduledJobActivity.json b/components/camel-ocsf/src/main/resources/schema/ScheduledJobActivity.json
index 24d4b6db68c6..4df3ca8839b6 100644
--- a/components/camel-ocsf/src/main/resources/schema/ScheduledJobActivity.json
+++ b/components/camel-ocsf/src/main/resources/schema/ScheduledJobActivity.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/classes/scheduled_job_activity",
+  "$id": "https://schema.ocsf.io/1.8.0/classes/scheduled_job_activity",
   "title": "ScheduledJobActivity",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.ScheduledJobActivity",
@@ -9,16 +9,12 @@
     "$ref": "OcsfEvent.json"
   },
   "properties": {
-    "actor": {
-      "$ref": "Actor.json"
-    },
-    "raw_data_size": {
-      "type": "integer",
-      "title": "Raw Data Size"
-    },
     "device": {
       "$ref": "Device.json"
     },
+    "actor": {
+      "$ref": "Actor.json"
+    },
     "enrichments": {
       "type": "array",
       "description": "",
@@ -26,12 +22,16 @@
         "$ref": "Enrichment.json"
       }
     },
-    "raw_data_hash": {
-      "$ref": "Fingerprint.json"
-    },
     "job": {
       "type": "object",
       "additionalProperties": true
+    },
+    "raw_data_hash": {
+      "$ref": "Fingerprint.json"
+    },
+    "raw_data_size": {
+      "type": "integer",
+      "title": "Raw Data Size"
     }
   }
 }
\ No newline at end of file
diff --git a/components/camel-ocsf/src/main/resources/schema/SecurityFinding.json b/components/camel-ocsf/src/main/resources/schema/SecurityFinding.json
index 020421341541..62f5a618d104 100644
--- a/components/camel-ocsf/src/main/resources/schema/SecurityFinding.json
+++ b/components/camel-ocsf/src/main/resources/schema/SecurityFinding.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/classes/security_finding",
+  "$id": "https://schema.ocsf.io/1.8.0/classes/security_finding",
   "title": "SecurityFinding",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.SecurityFinding",
@@ -9,112 +9,124 @@
     "$ref": "OcsfEvent.json"
   },
   "properties": {
-    "impact": {
+    "impact_id": {
+      "type": "integer",
+      "title": "Impact ID"
+    },
+    "state": {
       "type": "string",
-      "title": "Impact"
+      "title": "State"
     },
-    "resources": {
+    "compliance": {
+      "$ref": "Compliance.json"
+    },
+    "impact_score": {
+      "type": "integer",
+      "title": "Impact Score"
+    },
+    "evidence": {
+      "type": [
+        "object",
+        "string",
+        "integer",
+        "number",
+        "boolean",
+        "array",
+        "null"
+      ],
+      "title": "Evidence"
+    },
+    "risk_level": {
+      "type": "string",
+      "title": "Risk Level"
+    },
+    "vulnerabilities": {
       "type": "array",
       "description": "",
       "items": {
-        "$ref": "ResourceDetails.json"
+        "$ref": "Vulnerability.json"
       }
     },
-    "raw_data_size": {
-      "type": "integer",
-      "title": "Raw Data Size"
-    },
     "risk_score": {
       "type": "integer",
       "title": "Risk Score"
     },
-    "process": {
-      "$ref": "Process.json"
-    },
-    "state": {
-      "type": "string",
-      "title": "State"
-    },
-    "kill_chain": {
+    "cis_csc": {
       "type": "array",
-      "description": "",
+      "title": "CIS CSC",
       "items": {
-        "$ref": "KillChainPhase.json"
+        "type": "object",
+        "additionalProperties": true
       }
     },
-    "enrichments": {
+    "nist": {
       "type": "array",
-      "description": "",
+      "title": "NIST List",
       "items": {
-        "$ref": "Enrichment.json"
+        "type": "string"
       }
     },
-    "confidence_score": {
-      "type": "integer",
-      "title": "Confidence Score"
+    "data_sources": {
+      "type": "array",
+      "title": "Data Sources",
+      "items": {
+        "type": "string"
+      }
     },
-    "state_id": {
-      "type": "integer",
-      "title": "State ID"
+    "confidence": {
+      "type": "string",
+      "title": "Confidence"
     },
-    "impact_id": {
+    "risk_level_id": {
       "type": "integer",
-      "title": "Impact ID"
+      "title": "Risk Level ID"
     },
     "finding": {
       "type": "object",
       "additionalProperties": true
     },
-    "malware": {
+    "kill_chain": {
       "type": "array",
       "description": "",
       "items": {
-        "$ref": "Malware.json"
+        "$ref": "KillChainPhase.json"
+      }
+    },
+    "resources": {
+      "type": "array",
+      "description": "",
+      "items": {
+        "$ref": "ResourceDetails.json"
       }
     },
     "confidence_id": {
       "type": "integer",
       "title": "Confidence ID"
     },
-    "evidence": {
-      "type": [
-        "object",
-        "string",
-        "integer",
-        "number",
-        "boolean",
-        "array",
-        "null"
-      ],
-      "title": "Evidence"
-    },
-    "cis_csc": {
-      "type": "array",
-      "title": "CIS CSC",
-      "items": {
-        "type": "object",
-        "additionalProperties": true
-      }
+    "confidence_score": {
+      "type": "integer",
+      "title": "Confidence Score"
     },
     "analytic": {
       "$ref": "Analytic.json"
     },
-    "vulnerabilities": {
-      "type": "array",
-      "description": "",
-      "items": {
-        "$ref": "Vulnerability.json"
-      }
+    "process": {
+      "$ref": "Process.json"
     },
-    "risk_level_id": {
+    "state_id": {
       "type": "integer",
-      "title": "Risk Level ID"
+      "title": "State ID"
     },
-    "compliance": {
-      "$ref": "Compliance.json"
+    "impact": {
+      "type": "string",
+      "title": "Impact"
     },
-    "raw_data_hash": {
-      "$ref": "Fingerprint.json"
+    "malware": {
+      "type": "array",
+      "description": "",
+      "items": {
+        "$ref": "Malware.json"
+      }
     },
     "attacks": {
       "type": "array",
@@ -123,30 +135,18 @@
         "$ref": "Attack.json"
       }
     },
-    "impact_score": {
+    "raw_data_size": {
       "type": "integer",
-      "title": "Impact Score"
-    },
-    "confidence": {
-      "type": "string",
-      "title": "Confidence"
-    },
-    "nist": {
-      "type": "array",
-      "title": "NIST List",
-      "items": {
-        "type": "string"
-      }
+      "title": "Raw Data Size"
     },
-    "risk_level": {
-      "type": "string",
-      "title": "Risk Level"
+    "raw_data_hash": {
+      "$ref": "Fingerprint.json"
     },
-    "data_sources": {
+    "enrichments": {
       "type": "array",
-      "title": "Data Sources",
+      "description": "",
       "items": {
-        "type": "string"
+        "$ref": "Enrichment.json"
       }
     }
   }
diff --git a/components/camel-ocsf/src/main/resources/schema/Service.json b/components/camel-ocsf/src/main/resources/schema/Service.json
index 59a72024a957..b569cf8bee09 100644
--- a/components/camel-ocsf/src/main/resources/schema/Service.json
+++ b/components/camel-ocsf/src/main/resources/schema/Service.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/service",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/service",
   "title": "Service",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.Service",
diff --git a/components/camel-ocsf/src/main/resources/schema/Session.json b/components/camel-ocsf/src/main/resources/schema/Session.json
index 73c9beed217f..8667f88e418e 100644
--- a/components/camel-ocsf/src/main/resources/schema/Session.json
+++ b/components/camel-ocsf/src/main/resources/schema/Session.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/session",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/session",
   "title": "Session",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.Session",
diff --git a/components/camel-ocsf/src/main/resources/schema/SmbActivity.json b/components/camel-ocsf/src/main/resources/schema/SmbActivity.json
index e7a3c4aad294..305032c05ed9 100644
--- a/components/camel-ocsf/src/main/resources/schema/SmbActivity.json
+++ b/components/camel-ocsf/src/main/resources/schema/SmbActivity.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/classes/smb_activity",
+  "$id": "https://schema.ocsf.io/1.8.0/classes/smb_activity",
   "title": "SmbActivity",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.SmbActivity",
@@ -9,85 +9,90 @@
     "$ref": "OcsfEvent.json"
   },
   "properties": {
-    "client_dialects": {
+    "open_type": {
+      "type": "string",
+      "title": "Open Type"
+    },
+    "ja4_fingerprint_list": {
       "type": "array",
-      "title": "Client Dialects",
+      "title": "JA4+ Fingerprints",
       "items": {
-        "type": "string"
+        "$ref": "Ja4Fingerprint.json"
       }
     },
-    "cumulative_traffic": {
-      "type": "object",
-      "additionalProperties": true
+    "observation_point": {
+      "type": "string",
+      "title": "Observation Point"
     },
-    "connection_info": {
-      "type": "object",
-      "additionalProperties": true
+    "src_endpoint": {
+      "$ref": "NetworkEndpoint.json"
     },
-    "share": {
+    "tree_uid": {
       "type": "string",
-      "title": "Share"
+      "title": "Tree UID"
     },
-    "raw_data_size": {
+    "tls": {
+      "$ref": "Tls.json"
+    },
+    "cumulative_traffic": {
+      "type": "object",
+      "additionalProperties": true
+    },
+    "share_type_id": {
       "type": "integer",
-      "title": "Raw Data Size"
+      "title": "Share Type ID"
     },
-    "open_type": {
-      "type": "string",
-      "title": "Open Type"
+    "response": {
+      "$ref": "Response.json"
     },
-    "file": {
-      "$ref": "File.json"
+    "dst_endpoint": {
+      "$ref": "NetworkEndpoint.json"
     },
-    "enrichments": {
+    "packet_list": {
       "type": "array",
       "description": "",
       "items": {
-        "$ref": "Enrichment.json"
+        "$ref": "Packet.json"
       }
     },
-    "traffic": {
+    "connection_info": {
       "type": "object",
       "additionalProperties": true
     },
-    "share_type": {
+    "app_name": {
       "type": "string",
-      "title": "Share Type"
+      "title": "Application Name"
     },
-    "src_endpoint": {
+    "traffic": {
+      "type": "object",
+      "additionalProperties": true
+    },
+    "network_observation_point": {
       "$ref": "NetworkEndpoint.json"
     },
-    "app_name": {
+    "share": {
       "type": "string",
-      "title": "Application Name"
+      "title": "Share"
     },
-    "share_type_id": {
-      "type": "integer",
-      "title": "Share Type ID"
+    "share_type": {
+      "type": "string",
+      "title": "Share Type"
+    },
+    "dce_rpc": {
+      "type": "object",
+      "additionalProperties": true
     },
     "command": {
       "type": "string",
       "title": "Command"
     },
-    "dst_endpoint": {
-      "$ref": "NetworkEndpoint.json"
-    },
-    "response": {
-      "$ref": "Response.json"
-    },
-    "raw_data_hash": {
-      "$ref": "Fingerprint.json"
-    },
-    "ja4_fingerprint_list": {
-      "type": "array",
-      "title": "JA4+ Fingerprints",
-      "items": {
-        "$ref": "Ja4Fingerprint.json"
-      }
+    "dialect": {
+      "type": "string",
+      "title": "Dialect"
     },
-    "tree_uid": {
+    "app_protocol_name": {
       "type": "string",
-      "title": "Tree UID"
+      "title": "Application Protocol Name"
     },
     "observation_point_id": {
       "type": "integer",
@@ -97,20 +102,29 @@
       "type": "object",
       "additionalProperties": true
     },
-    "dialect": {
-      "type": "string",
-      "title": "Dialect"
+    "raw_data_size": {
+      "type": "integer",
+      "title": "Raw Data Size"
     },
-    "dce_rpc": {
-      "type": "object",
-      "additionalProperties": true
+    "client_dialects": {
+      "type": "array",
+      "title": "Client Dialects",
+      "items": {
+        "type": "string"
+      }
     },
-    "observation_point": {
-      "type": "string",
-      "title": "Observation Point"
+    "raw_data_hash": {
+      "$ref": "Fingerprint.json"
     },
-    "tls": {
-      "$ref": "Tls.json"
+    "file": {
+      "$ref": "File.json"
+    },
+    "enrichments": {
+      "type": "array",
+      "description": "",
+      "items": {
+        "$ref": "Enrichment.json"
+      }
     }
   }
 }
\ No newline at end of file
diff --git a/components/camel-ocsf/src/main/resources/schema/SshActivity.json b/components/camel-ocsf/src/main/resources/schema/SshActivity.json
index e76365e333dc..c6b1bbeb1c17 100644
--- a/components/camel-ocsf/src/main/resources/schema/SshActivity.json
+++ b/components/camel-ocsf/src/main/resources/schema/SshActivity.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/classes/ssh_activity",
+  "$id": "https://schema.ocsf.io/1.8.0/classes/ssh_activity",
   "title": "SshActivity",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.SshActivity",
@@ -9,11 +9,32 @@
     "$ref": "OcsfEvent.json"
   },
   "properties": {
-    "cumulative_traffic": {
+    "server_hassh": {
       "type": "object",
       "additionalProperties": true
     },
-    "connection_info": {
+    "ja4_fingerprint_list": {
+      "type": "array",
+      "title": "JA4+ Fingerprints",
+      "items": {
+        "$ref": "Ja4Fingerprint.json"
+      }
+    },
+    "observation_point": {
+      "type": "string",
+      "title": "Observation Point"
+    },
+    "src_endpoint": {
+      "$ref": "NetworkEndpoint.json"
+    },
+    "tls": {
+      "$ref": "Tls.json"
+    },
+    "protocol_ver": {
+      "type": "string",
+      "title": "SSH Version"
+    },
+    "cumulative_traffic": {
       "type": "object",
       "additionalProperties": true
     },
@@ -21,74 +42,67 @@
       "type": "integer",
       "title": "Authentication Type ID"
     },
-    "raw_data_size": {
-      "type": "integer",
-      "title": "Raw Data Size"
-    },
-    "protocol_ver": {
-      "type": "string",
-      "title": "SSH Version"
+    "client_hassh": {
+      "type": "object",
+      "additionalProperties": true
     },
-    "file": {
-      "$ref": "File.json"
+    "dst_endpoint": {
+      "$ref": "NetworkEndpoint.json"
     },
-    "enrichments": {
+    "packet_list": {
       "type": "array",
       "description": "",
       "items": {
-        "$ref": "Enrichment.json"
+        "$ref": "Packet.json"
       }
     },
-    "traffic": {
+    "connection_info": {
       "type": "object",
       "additionalProperties": true
     },
-    "src_endpoint": {
-      "$ref": "NetworkEndpoint.json"
-    },
     "app_name": {
       "type": "string",
       "title": "Application Name"
     },
-    "client_hassh": {
+    "auth_type": {
+      "type": "string",
+      "title": "Authentication Type"
+    },
+    "traffic": {
       "type": "object",
       "additionalProperties": true
     },
-    "dst_endpoint": {
+    "network_observation_point": {
       "$ref": "NetworkEndpoint.json"
     },
-    "raw_data_hash": {
-      "$ref": "Fingerprint.json"
-    },
-    "ja4_fingerprint_list": {
-      "type": "array",
-      "title": "JA4+ Fingerprints",
-      "items": {
-        "$ref": "Ja4Fingerprint.json"
-      }
+    "app_protocol_name": {
+      "type": "string",
+      "title": "Application Protocol Name"
     },
     "observation_point_id": {
       "type": "integer",
       "title": "Observation Point ID"
     },
-    "auth_type": {
-      "type": "string",
-      "title": "Authentication Type"
-    },
     "proxy": {
       "type": "object",
       "additionalProperties": true
     },
-    "observation_point": {
-      "type": "string",
-      "title": "Observation Point"
+    "raw_data_size": {
+      "type": "integer",
+      "title": "Raw Data Size"
     },
-    "server_hassh": {
-      "type": "object",
-      "additionalProperties": true
+    "raw_data_hash": {
+      "$ref": "Fingerprint.json"
     },
-    "tls": {
-      "$ref": "Tls.json"
+    "file": {
+      "$ref": "File.json"
+    },
+    "enrichments": {
+      "type": "array",
+      "description": "",
+      "items": {
+        "$ref": "Enrichment.json"
+      }
     }
   }
 }
\ No newline at end of file
diff --git a/components/camel-ocsf/src/main/resources/schema/SubTechnique.json b/components/camel-ocsf/src/main/resources/schema/SubTechnique.json
index fac7b873cbf6..856eb17b692e 100644
--- a/components/camel-ocsf/src/main/resources/schema/SubTechnique.json
+++ b/components/camel-ocsf/src/main/resources/schema/SubTechnique.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/sub_technique",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/sub_technique",
   "title": "SubTechnique",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.SubTechnique",
diff --git a/components/camel-ocsf/src/main/resources/schema/Tactic.json b/components/camel-ocsf/src/main/resources/schema/Tactic.json
index b703d83d4f92..dc81b1b6950f 100644
--- a/components/camel-ocsf/src/main/resources/schema/Tactic.json
+++ b/components/camel-ocsf/src/main/resources/schema/Tactic.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/tactic",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/tactic",
   "title": "Tactic",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.Tactic",
diff --git a/components/camel-ocsf/src/main/resources/schema/Technique.json b/components/camel-ocsf/src/main/resources/schema/Technique.json
index f6f234b3a488..ff0b262f053c 100644
--- a/components/camel-ocsf/src/main/resources/schema/Technique.json
+++ b/components/camel-ocsf/src/main/resources/schema/Technique.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/technique",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/technique",
   "title": "Technique",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.Technique",
diff --git a/components/camel-ocsf/src/main/resources/schema/Ticket.json b/components/camel-ocsf/src/main/resources/schema/Ticket.json
index 48eab875fbab..1c6f69ba0917 100644
--- a/components/camel-ocsf/src/main/resources/schema/Ticket.json
+++ b/components/camel-ocsf/src/main/resources/schema/Ticket.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/ticket",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/ticket",
   "title": "Ticket",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.Ticket",
diff --git a/components/camel-ocsf/src/main/resources/schema/Tls.json b/components/camel-ocsf/src/main/resources/schema/Tls.json
index b420e3db7e6c..15496786377a 100644
--- a/components/camel-ocsf/src/main/resources/schema/Tls.json
+++ b/components/camel-ocsf/src/main/resources/schema/Tls.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/tls",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/tls",
   "title": "Tls",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.Tls",
@@ -25,6 +25,10 @@
       "type": "string",
       "title": "Cipher Suite"
     },
+    "sni": {
+      "type": "string",
+      "title": "Server Name Indication"
+    },
     "certificate_chain": {
       "type": "array",
       "title": "Certificate Chain",
@@ -32,10 +36,6 @@
         "type": "string"
       }
     },
-    "sni": {
-      "type": "string",
-      "title": "Server Name Indication"
-    },
     "client_ciphers": {
       "type": "array",
       "title": "Client Cipher Suites",
diff --git a/components/camel-ocsf/src/main/resources/schema/Token.json b/components/camel-ocsf/src/main/resources/schema/Token.json
new file mode 100644
index 000000000000..c36b58daea41
--- /dev/null
+++ b/components/camel-ocsf/src/main/resources/schema/Token.json
@@ -0,0 +1,54 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/token",
+  "title": "Token",
+  "type": "object",
+  "javaType": "org.apache.camel.dataformat.ocsf.model.Token",
+  "additionalProperties": true,
+  "properties": {
+    "name": {
+      "type": "string",
+      "title": "Name"
+    },
+    "type": {
+      "type": "string",
+      "title": "Type"
+    },
+    "uid": {
+      "type": "string",
+      "title": "Unique ID"
+    },
+    "type_id": {
+      "type": "integer",
+      "title": "Type ID"
+    },
+    "created_time": {
+      "type": "integer",
+      "existingJavaType": "java.lang.Long",
+      "title": "Created Time"
+    },
+    "expiration_time": {
+      "type": "integer",
+      "existingJavaType": "java.lang.Long",
+      "title": "Expiration Time"
+    },
+    "is_renewable": {
+      "type": "boolean",
+      "title": "Renewable"
+    },
+    "modified_time": {
+      "type": "integer",
+      "existingJavaType": "java.lang.Long",
+      "title": "Modified Time"
+    },
+    "tenant_uid": {
+      "type": "string",
+      "title": "Tenant UID"
+    },
+    "zone": {
+      "type": "string",
+      "title": "Network Zone"
+    }
+  },
+  "description": "The Token object."
+}
\ No newline at end of file
diff --git a/components/camel-ocsf/src/main/resources/schema/Url.json b/components/camel-ocsf/src/main/resources/schema/Url.json
index b11a26817fe9..a4817204454b 100644
--- a/components/camel-ocsf/src/main/resources/schema/Url.json
+++ b/components/camel-ocsf/src/main/resources/schema/Url.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/url",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/url",
   "title": "Url",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.Url",
@@ -45,93 +45,93 @@
       "items": {
         "type": "integer",
         "enum": [
+          46,
+          114,
           5,
+          84,
+          55,
+          89,
+          17,
+          45,
+          98,
+          59,
+          56,
+          36,
           83,
-          35,
-          6,
-          93,
           65,
-          64,
-          11,
-          49,
-          32,
-          51,
-          27,
-          97,
-          66,
+          20,
+          6,
+          88,
+          121,
+          61,
+          113,
           50,
-          96,
           86,
-          98,
-          52,
-          25,
-          38,
-          85,
+          67,
+          16,
+          96,
+          24,
           110,
-          23,
-          29,
-          118,
-          53,
-          56,
+          34,
+          68,
+          30,
+          51,
+          64,
           3,
-          36,
-          17,
-          9,
+          111,
+          15,
+          90,
+          40,
+          103,
+          106,
+          97,
           63,
-          89,
-          112,
-          121,
+          54,
+          0,
+          118,
+          31,
+          9,
+          4,
           44,
-          107,
-          68,
+          37,
+          49,
+          99,
           33,
-          92,
-          114,
-          106,
-          45,
-          108,
-          55,
-          84,
+          25,
+          53,
+          26,
+          109,
           101,
-          111,
-          87,
-          4,
-          0,
-          15,
-          88,
-          20,
-          40,
           18,
-          71,
-          61,
-          30,
+          32,
           22,
-          47,
-          14,
-          59,
-          58,
-          60,
-          95,
-          113,
-          16,
-          54,
-          46,
-          67,
-          103,
-          24,
+          43,
+          52,
+          92,
+          112,
           57,
-          109,
+          35,
+          95,
+          27,
+          66,
+          29,
           102,
+          71,
           7,
-          99,
-          34,
-          26,
-          43,
-          90,
-          37,
-          31,
+          58,
+          1,
+          14,
+          107,
+          47,
+          87,
+          108,
+          38,
+          93,
+          60,
+          23,
+          11,
           21,
-          1
+          85
         ]
       }
     },
diff --git a/components/camel-ocsf/src/main/resources/schema/User.json b/components/camel-ocsf/src/main/resources/schema/User.json
index 9442085fa780..383ee376cf01 100644
--- a/components/camel-ocsf/src/main/resources/schema/User.json
+++ b/components/camel-ocsf/src/main/resources/schema/User.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/user",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/user",
   "title": "User",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.User",
@@ -22,9 +22,6 @@
       "type": "string",
       "title": "Unique ID"
     },
-    "org": {
-      "$ref": "Organization.json"
-    },
     "groups": {
       "type": "array",
       "title": "Groups",
@@ -32,14 +29,17 @@
         "$ref": "Group.json"
       }
     },
-    "type_id": {
-      "type": "integer",
-      "title": "Type ID"
+    "org": {
+      "$ref": "Organization.json"
     },
     "full_name": {
       "type": "string",
       "title": "Full Name"
     },
+    "type_id": {
+      "type": "integer",
+      "title": "Type ID"
+    },
     "account": {
       "$ref": "Account.json"
     },
diff --git a/components/camel-ocsf/src/main/resources/schema/UserAccess.json b/components/camel-ocsf/src/main/resources/schema/UserAccess.json
index b27b0251c83c..a4f105570bc9 100644
--- a/components/camel-ocsf/src/main/resources/schema/UserAccess.json
+++ b/components/camel-ocsf/src/main/resources/schema/UserAccess.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/classes/user_access",
+  "$id": "https://schema.ocsf.io/1.8.0/classes/user_access",
   "title": "UserAccess",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.UserAccess",
@@ -9,12 +9,14 @@
     "$ref": "OcsfEvent.json"
   },
   "properties": {
-    "privileges": {
-      "type": "array",
-      "title": "Privileges",
-      "items": {
-        "type": "string"
-      }
+    "src_endpoint": {
+      "$ref": "NetworkEndpoint.json"
+    },
+    "http_response": {
+      "$ref": "HttpResponse.json"
+    },
+    "user": {
+      "$ref": "User.json"
     },
     "actor": {
       "$ref": "Actor.json"
@@ -26,34 +28,32 @@
         "$ref": "ResourceDetails.json"
       }
     },
-    "raw_data_size": {
-      "type": "integer",
-      "title": "Raw Data Size"
-    },
-    "http_response": {
-      "$ref": "HttpResponse.json"
-    },
-    "enrichments": {
+    "privileges": {
       "type": "array",
-      "description": "",
+      "title": "Privileges",
       "items": {
-        "$ref": "Enrichment.json"
+        "type": "string"
       }
     },
     "http_request": {
       "$ref": "HttpRequest.json"
     },
-    "src_endpoint": {
-      "$ref": "NetworkEndpoint.json"
-    },
-    "user": {
-      "$ref": "User.json"
-    },
     "resource": {
       "$ref": "ResourceDetails.json"
     },
+    "raw_data_size": {
+      "type": "integer",
+      "title": "Raw Data Size"
+    },
     "raw_data_hash": {
       "$ref": "Fingerprint.json"
+    },
+    "enrichments": {
+      "type": "array",
+      "description": "",
+      "items": {
+        "$ref": "Enrichment.json"
+      }
     }
   }
 }
\ No newline at end of file
diff --git a/components/camel-ocsf/src/main/resources/schema/VendorAttributes.json b/components/camel-ocsf/src/main/resources/schema/VendorAttributes.json
index 2a0072c79d99..0060c52bef2f 100644
--- a/components/camel-ocsf/src/main/resources/schema/VendorAttributes.json
+++ b/components/camel-ocsf/src/main/resources/schema/VendorAttributes.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/vendor_attributes",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/vendor_attributes",
   "title": "VendorAttributes",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.VendorAttributes",
diff --git a/components/camel-ocsf/src/main/resources/schema/Vulnerability.json b/components/camel-ocsf/src/main/resources/schema/Vulnerability.json
index 154900e2b103..7b785f826dcb 100644
--- a/components/camel-ocsf/src/main/resources/schema/Vulnerability.json
+++ b/components/camel-ocsf/src/main/resources/schema/Vulnerability.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/objects/vulnerability",
+  "$id": "https://schema.ocsf.io/1.8.0/objects/vulnerability",
   "title": "Vulnerability",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.Vulnerability",
@@ -18,10 +18,6 @@
       "type": "string",
       "title": "Category"
     },
-    "severity": {
-      "type": "string",
-      "title": "Severity"
-    },
     "references": {
       "type": "array",
       "title": "References",
@@ -29,6 +25,10 @@
         "type": "string"
       }
     },
+    "severity": {
+      "type": "string",
+      "title": "Severity"
+    },
     "remediation": {
       "$ref": "Remediation.json"
     },
diff --git a/components/camel-ocsf/src/main/resources/schema/VulnerabilityFinding.json b/components/camel-ocsf/src/main/resources/schema/VulnerabilityFinding.json
index 9e9e631a1e30..d1fed1557cea 100644
--- a/components/camel-ocsf/src/main/resources/schema/VulnerabilityFinding.json
+++ b/components/camel-ocsf/src/main/resources/schema/VulnerabilityFinding.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/classes/vulnerability_finding",
+  "$id": "https://schema.ocsf.io/1.8.0/classes/vulnerability_finding",
   "title": "VulnerabilityFinding",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.VulnerabilityFinding",
@@ -9,61 +9,61 @@
     "$ref": "OcsfEvent.json"
   },
   "properties": {
-    "resources": {
+    "vulnerabilities": {
       "type": "array",
       "description": "",
       "items": {
-        "$ref": "ResourceDetails.json"
+        "$ref": "Vulnerability.json"
       }
     },
-    "raw_data_size": {
-      "type": "integer",
-      "title": "Raw Data Size"
-    },
-    "finding_info": {
-      "$ref": "FindingInfo.json"
+    "comment": {
+      "type": "string",
+      "title": "Comment"
     },
     "device": {
       "$ref": "Device.json"
     },
-    "enrichments": {
+    "confidence": {
+      "type": "string",
+      "title": "Confidence"
+    },
+    "resources": {
       "type": "array",
       "description": "",
       "items": {
-        "$ref": "Enrichment.json"
+        "$ref": "ResourceDetails.json"
       }
     },
+    "confidence_id": {
+      "type": "integer",
+      "title": "Confidence ID"
+    },
     "confidence_score": {
       "type": "integer",
       "title": "Confidence Score"
     },
-    "confidence_id": {
-      "type": "integer",
-      "title": "Confidence ID"
+    "vendor_attributes": {
+      "$ref": "VendorAttributes.json"
     },
-    "comment": {
-      "type": "string",
-      "title": "Comment"
+    "finding_info": {
+      "$ref": "FindingInfo.json"
     },
     "resource": {
       "$ref": "ResourceDetails.json"
     },
-    "vulnerabilities": {
-      "type": "array",
-      "description": "",
-      "items": {
-        "$ref": "Vulnerability.json"
-      }
-    },
-    "vendor_attributes": {
-      "$ref": "VendorAttributes.json"
+    "raw_data_size": {
+      "type": "integer",
+      "title": "Raw Data Size"
     },
     "raw_data_hash": {
       "$ref": "Fingerprint.json"
     },
-    "confidence": {
-      "type": "string",
-      "title": "Confidence"
+    "enrichments": {
+      "type": "array",
+      "description": "",
+      "items": {
+        "$ref": "Enrichment.json"
+      }
     }
   }
 }
\ No newline at end of file
diff --git a/components/camel-ocsf/src/main/resources/schema/WebResourcesActivity.json b/components/camel-ocsf/src/main/resources/schema/WebResourcesActivity.json
index 2d4e95d21acc..d6b2d1108b67 100644
--- a/components/camel-ocsf/src/main/resources/schema/WebResourcesActivity.json
+++ b/components/camel-ocsf/src/main/resources/schema/WebResourcesActivity.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.ocsf.io/1.7.0/classes/web_resources_activity",
+  "$id": "https://schema.ocsf.io/1.8.0/classes/web_resources_activity",
   "title": "WebResourcesActivity",
   "type": "object",
   "javaType": "org.apache.camel.dataformat.ocsf.model.WebResourcesActivity",
@@ -9,24 +9,16 @@
     "$ref": "OcsfEvent.json"
   },
   "properties": {
-    "raw_data_size": {
-      "type": "integer",
-      "title": "Raw Data Size"
+    "src_endpoint": {
+      "$ref": "NetworkEndpoint.json"
     },
     "http_response": {
       "$ref": "HttpResponse.json"
     },
-    "enrichments": {
-      "type": "array",
-      "description": "",
-      "items": {
-        "$ref": "Enrichment.json"
-      }
-    },
-    "http_request": {
-      "$ref": "HttpRequest.json"
+    "tls": {
+      "$ref": "Tls.json"
     },
-    "src_endpoint": {
+    "dst_endpoint": {
       "$ref": "NetworkEndpoint.json"
     },
     "web_resources": {
@@ -37,11 +29,8 @@
         "additionalProperties": true
       }
     },
-    "dst_endpoint": {
-      "$ref": "NetworkEndpoint.json"
-    },
-    "raw_data_hash": {
-      "$ref": "Fingerprint.json"
+    "http_request": {
+      "$ref": "HttpRequest.json"
     },
     "web_resources_result": {
       "type": "array",
@@ -51,8 +40,19 @@
         "additionalProperties": true
       }
     },
-    "tls": {
-      "$ref": "Tls.json"
+    "raw_data_size": {
+      "type": "integer",
+      "title": "Raw Data Size"
+    },
+    "raw_data_hash": {
+      "$ref": "Fingerprint.json"
+    },
+    "enrichments": {
+      "type": "array",
+      "description": "",
+      "items": {
+        "$ref": "Enrichment.json"
+      }
     }
   }
 }
\ No newline at end of file
diff --git a/components/camel-ocsf/src/main/script/generate-ocsf-schemas.py b/components/camel-ocsf/src/main/script/generate-ocsf-schemas.py
index 657f4f7047c0..51b4bcdaee9b 100644
--- a/components/camel-ocsf/src/main/script/generate-ocsf-schemas.py
+++ b/components/camel-ocsf/src/main/script/generate-ocsf-schemas.py
@@ -27,10 +27,12 @@ Key features:
 - Uses file-based $ref references (e.g., "$ref": "Attack.json")
 - Includes javaType annotations for proper class naming
 - Uses JSON Schema Draft-07 format
+- Falls back to downloading the schema from schema.ocsf.io for OCSF
+  versions not yet bundled in the ocsf-json-schema package
 
 Usage:
     pip install ocsf-json-schema
-    python generate-ocsf-schemas.py --version 1.7.0 --output ../resources/schema
+    python generate-ocsf-schemas.py --version 1.8.0 --output ../resources/schema
 
 The generated schemas are used by the jsonschema2pojo Maven plugin to generate
 Java POJOs at build time.
@@ -39,6 +41,7 @@ Java POJOs at build time.
 import argparse
 import json
 import sys
+import urllib.request
 from pathlib import Path
 
 try:
@@ -49,6 +52,13 @@ except ImportError:
     sys.exit(1)
 
 
+# Public OCSF schema export endpoint used as a fallback when the requested
+# version is not bundled inside the ocsf-json-schema package.
+OCSF_SCHEMA_EXPORT_URL = (
+    "https://schema.ocsf.io/{version}/export/schema?profiles=&extensions=win,linux,macos"
+)
+
+
 # Java package for generated classes
 JAVA_PACKAGE = "org.apache.camel.dataformat.ocsf.model"
 
@@ -102,7 +112,7 @@ CLASSES_TO_GENERATE = [
 ]
 
 # Objects to generate - reusable OCSF objects
-# These are objects that exist in the OCSF catalog (verified in 1.7.0)
+# These are objects that exist in the OCSF catalog (verified in 1.8.0)
 OBJECTS_TO_GENERATE = [
     'account',
     'actor',
@@ -150,6 +160,7 @@ OBJECTS_TO_GENERATE = [
     'organization',
     'os',
     'package',
+    'packet',
     'policy',
     'process',
     'product',
@@ -168,6 +179,7 @@ OBJECTS_TO_GENERATE = [
     'technique',
     'ticket',
     'tls',
+    'token',
     'url',
     'user',
     'vendor_attributes',
@@ -248,6 +260,9 @@ PROPERTY_TO_OBJECT_MAP = {
     'os': 'os',
     'package': 'package',
     'packages': 'package',  # array
+    'packet': 'packet',
+    'packets': 'packet',  # array
+    'packet_list': 'packet',  # array
     'policy': 'policy',
     'policies': 'policy',  # array
     'process': 'process',
@@ -270,6 +285,7 @@ PROPERTY_TO_OBJECT_MAP = {
     'technique': 'technique',
     'ticket': 'ticket',
     'tls': 'tls',
+    'token': 'token',
     'url': 'url',
     'user': 'user',
     'users': 'user',  # array
@@ -572,14 +588,33 @@ def generate_base_event_schema(ocsf: OcsfJsonSchemaEmbedded, output_dir: Path,
         return False
 
 
+def load_ocsf_schema(version: str) -> dict:
+    """
+    Load the OCSF schema for the given version.
+
+    First tries the bundled schemas shipped with the ocsf-json-schema package.
+    If the version is not bundled (e.g., a newer release than the package
+    knows about), falls back to downloading the schema export from
+    schema.ocsf.io.
+    """
+    try:
+        return get_ocsf_schema(version=version)
+    except FileNotFoundError:
+        url = OCSF_SCHEMA_EXPORT_URL.format(version=version)
+        print(f"  Version {version} not bundled in ocsf-json-schema package.")
+        print(f"  Downloading schema from {url} ...")
+        with urllib.request.urlopen(url) as response:
+            return json.loads(response.read().decode('utf-8'))
+
+
 def main():
     parser = argparse.ArgumentParser(
         description='Generate OCSF JSON Schema files for Apache Camel (jsonschema2pojo compatible)'
     )
     parser.add_argument(
         '--version', '-v',
-        default='1.7.0',
-        help='OCSF schema version (default: 1.7.0)'
+        default='1.8.0',
+        help='OCSF schema version (default: 1.8.0)'
     )
     parser.add_argument(
         '--output', '-o',
@@ -627,7 +662,7 @@ def main():
     # Load OCSF schema
     print(f"Loading OCSF schema version {args.version}...")
     try:
-        ocsf_schema = get_ocsf_schema(version=args.version)
+        ocsf_schema = load_ocsf_schema(args.version)
         ocsf = OcsfJsonSchemaEmbedded(ocsf_schema)
     except Exception as e:
         print(f"Error loading OCSF schema: {e}")
diff --git a/components/camel-ocsf/src/test/java/org/apache/camel/dataformat/ocsf/OcsfEventExampleTest.java b/components/camel-ocsf/src/test/java/org/apache/camel/dataformat/ocsf/OcsfEventExampleTest.java
index 815ef53f4f1c..b971b25235c4 100644
--- a/components/camel-ocsf/src/test/java/org/apache/camel/dataformat/ocsf/OcsfEventExampleTest.java
+++ b/components/camel-ocsf/src/test/java/org/apache/camel/dataformat/ocsf/OcsfEventExampleTest.java
@@ -73,7 +73,7 @@ public class OcsfEventExampleTest extends CamelTestSupport {
         assertThat(finding.getFindingInfo().getTitle()).contains("CryptoCurrency");
         assertThat(finding.getFindingInfo().getDesc()).contains("Bitcoin-related activity");
 
-        // Verify MITRE ATT&CK mapping (attacks are in FindingInfo in OCSF 1.7.0)
+        // Verify MITRE ATT&CK mapping (attacks are in FindingInfo in OCSF 1.8.0)
         assertThat(finding.getFindingInfo().getAttacks()).hasSize(1);
         Attack attack = finding.getFindingInfo().getAttacks().get(0);
         assertThat(attack.getTactic().getName()).isEqualTo("Impact");
@@ -146,7 +146,7 @@ public class OcsfEventExampleTest extends CamelTestSupport {
         info.setLastSeenTime(1706198400000L);
         finding.setFindingInfo(info);
 
-        // MITRE ATT&CK mapping (attacks are set on FindingInfo in OCSF 1.7.0)
+        // MITRE ATT&CK mapping (attacks are set on FindingInfo in OCSF 1.8.0)
         Attack attack = new Attack();
         Tactic tactic = new Tactic();
         tactic.setName("Initial Access");
@@ -190,7 +190,7 @@ public class OcsfEventExampleTest extends CamelTestSupport {
 
         // Metadata
         Metadata metadata = new Metadata();
-        metadata.setVersion("1.7.0");
+        metadata.setVersion("1.8.0");
         Product product = new Product();
         product.setName("Application WAF");
         product.setVendorName("MyCompany");
@@ -236,7 +236,7 @@ public class OcsfEventExampleTest extends CamelTestSupport {
                     "time": 1706198400,
                     "message": "File created: /var/log/application.log",
                     "metadata": {
-                        "version": "1.7.0",
+                        "version": "1.8.0",
                         "product": {
                             "name": "File Integrity Monitor",
                             "vendor_name": "SecurityTools"
@@ -278,7 +278,7 @@ public class OcsfEventExampleTest extends CamelTestSupport {
 
         // Metadata is a proper object
         assertThat(event.getMetadata()).isNotNull();
-        assertThat(event.getMetadata().getVersion()).isEqualTo("1.7.0");
+        assertThat(event.getMetadata().getVersion()).isEqualTo("1.8.0");
         assertThat(event.getMetadata().getProduct().getName()).isEqualTo("File Integrity Monitor");
 
         // Fields not in OcsfEvent schema go to additionalProperties
diff --git a/components/camel-ocsf/src/test/resources/ocsf-detection-finding-example.json b/components/camel-ocsf/src/test/resources/ocsf-detection-finding-example.json
index e636d012d519..ea4512984974 100644
--- a/components/camel-ocsf/src/test/resources/ocsf-detection-finding-example.json
+++ b/components/camel-ocsf/src/test/resources/ocsf-detection-finding-example.json
@@ -17,7 +17,7 @@
   "message": "Potential cryptocurrency mining activity detected on EC2 instance",
 
   "metadata": {
-    "version": "1.7.0",
+    "version": "1.8.0",
     "product": {
       "name": "GuardDuty",
       "vendor_name": "AWS",