diff --git a/.github/workflows/lint-report.yml b/.github/workflows/lint-report.yml
index 49108bc..91d2c70 100644
--- a/.github/workflows/lint-report.yml
+++ b/.github/workflows/lint-report.yml
@@ -39,19 +39,20 @@ jobs:
       - name: Run Android Lint (advanced)
         run: cd Maps3DSamples/advanced && ./gradlew lint
 
-      - name: Merge SARIF files
-        run: |
-          jq -s '{ 
-            "$schema": "https://json.schemastore.org/sarif-2.1.0", 
-            "version": "2.1.0", 
-            "runs": map(.runs) | add 
-          }' \
-            Maps3DSamples/ApiDemos/common/build/reports/lint-results-debug.sarif \
-            Maps3DSamples/ApiDemos/kotlin-app/build/reports/lint-results-debug.sarif \
-            Maps3DSamples/advanced/app/build/reports/lint-results-debug.sarif \
-          > merged.sarif
-
-      - name: Upload SARIF file
+      - name: Upload SARIF (ApiDemos - Common)
         uses: github/codeql-action/upload-sarif@v3
         with:
-          sarif_file: merged.sarif
+          sarif_file: Maps3DSamples/ApiDemos/common/build/reports/lint-results-debug.sarif
+          category: apidemos-common
+
+      - name: Upload SARIF (ApiDemos - Kotlin App)
+        uses: github/codeql-action/upload-sarif@v3
+        with:
+          sarif_file: Maps3DSamples/ApiDemos/kotlin-app/build/reports/lint-results-debug.sarif
+          category: apidemos-kotlinapp
+
+      - name: Upload SARIF (Advanced App)
+        uses: github/codeql-action/upload-sarif@v3
+        with:
+          sarif_file: Maps3DSamples/advanced/app/build/reports/lint-results-debug.sarif
+          category: advanced-app