diff --git a/prowler/lib/outputs/json_ocsf/json_ocsf.py b/prowler/lib/outputs/json_ocsf/json_ocsf.py
index 730392a682..560345fe26 100644
--- a/prowler/lib/outputs/json_ocsf/json_ocsf.py
+++ b/prowler/lib/outputs/json_ocsf/json_ocsf.py
@@ -107,7 +107,16 @@ def fill_json_ocsf(finding_output: FindingOutput) -> DetectionFinding:
             ),
             type_uid=DetectionFindingTypeID.Create,
             type_name=DetectionFindingTypeID.Create.name,
-            unmapped={"check_id": finding_output.check_id},
+            unmapped={
+                "check_id": finding_output.check_id,
+                "check_type": finding_output.check_type,
+                "risk": finding_output.risk,
+                "related_url": finding_output.related_url,
+                "categories": finding_output.categories,
+                "depends_on": finding_output.depends_on,
+                "related_to": finding_output.related_to,
+                "notes": finding_output.notes,
+            },
         )
 
         if finding_output.provider == "kubernetes":
diff --git a/tests/lib/outputs/fixtures/fixtures.py b/tests/lib/outputs/fixtures/fixtures.py
index 39ba5ebaf8..5482d10222 100644
--- a/tests/lib/outputs/fixtures/fixtures.py
+++ b/tests/lib/outputs/fixtures/fixtures.py
@@ -37,8 +37,8 @@ def generate_finding_output(status, severity, muted, region) -> FindingOutput:
         partition="aws",
         region=region,
         description="check description",
-        risk="",
-        related_url="",
+        risk="test-risk",
+        related_url="test-url",
         remediation_recommendation_text="",
         remediation_recommendation_url="",
         remediation_code_nativeiac="",
@@ -46,9 +46,9 @@ def generate_finding_output(status, severity, muted, region) -> FindingOutput:
         remediation_code_cli="",
         remediation_code_other="",
         compliance="",
-        categories="",
-        depends_on="",
-        related_to="",
-        notes="",
+        categories="test-category",
+        depends_on="test-dependency",
+        related_to="test-related-to",
+        notes="test-notes",
         prowler_version=prowler_version,
     )
diff --git a/tests/lib/outputs/json_ocsf/json_ocsf_test.py b/tests/lib/outputs/json_ocsf/json_ocsf_test.py
index 1bc9cef24f..e17d095a9f 100644
--- a/tests/lib/outputs/json_ocsf/json_ocsf_test.py
+++ b/tests/lib/outputs/json_ocsf/json_ocsf_test.py
@@ -74,7 +74,16 @@ class TestOutputJSONOCSF:
         assert finding_json_ocsf.status_detail == finding_output.status_extended
 
         # Unmapped Data
-        assert finding_json_ocsf.unmapped == {"check_id": finding_output.check_id}
+        assert finding_json_ocsf.unmapped == {
+            "check_id": finding_output.check_id,
+            "check_type": finding_output.check_type,
+            "risk": finding_output.risk,
+            "related_url": finding_output.related_url,
+            "categories": finding_output.categories,
+            "depends_on": finding_output.depends_on,
+            "related_to": finding_output.related_to,
+            "notes": finding_output.notes,
+        }
 
         # ResourceDetails
         resource_details = finding_json_ocsf.resources