diff --git a/.github/workflows/apps-api-security-deps.yml b/.github/workflows/apps-api-security-deps.yml
index 91f895ab..dea90309 100644
--- a/.github/workflows/apps-api-security-deps.yml
+++ b/.github/workflows/apps-api-security-deps.yml
@@ -74,7 +74,7 @@ jobs:
         uses: github/codeql-action/upload-sarif@7c1e4cf0b20d7c1872b26569c00ba908797a59bf # v4
         with:
           sarif_file: osv-results.sarif
-          category: osv-scanner
+          category: osv-scanner-api
         continue-on-error: true
 
       - name: Fail on osv findings
diff --git a/.github/workflows/apps-api-security-sast.yml b/.github/workflows/apps-api-security-sast.yml
index dea2cc1c..f957da5b 100644
--- a/.github/workflows/apps-api-security-sast.yml
+++ b/.github/workflows/apps-api-security-sast.yml
@@ -92,5 +92,5 @@ jobs:
         uses: github/codeql-action/upload-sarif@7c1e4cf0b20d7c1872b26569c00ba908797a59bf # v4
         with:
           sarif_file: semgrep-results.sarif
-          category: semgrep
+          category: semgrep-api
         continue-on-error: true
diff --git a/.github/workflows/apps-api-security-secrets.yml b/.github/workflows/apps-api-security-secrets.yml
index 7751270e..81798cfe 100644
--- a/.github/workflows/apps-api-security-secrets.yml
+++ b/.github/workflows/apps-api-security-secrets.yml
@@ -79,5 +79,5 @@ jobs:
         uses: github/codeql-action/upload-sarif@7c1e4cf0b20d7c1872b26569c00ba908797a59bf # v4
         with:
           sarif_file: gitleaks-results.sarif
-          category: gitleaks
+          category: gitleaks-api
         continue-on-error: true
diff --git a/.github/workflows/apps-docs-security-deps.yml b/.github/workflows/apps-docs-security-deps.yml
index 71959047..11717ec0 100644
--- a/.github/workflows/apps-docs-security-deps.yml
+++ b/.github/workflows/apps-docs-security-deps.yml
@@ -74,7 +74,7 @@ jobs:
         uses: github/codeql-action/upload-sarif@7c1e4cf0b20d7c1872b26569c00ba908797a59bf # v4
         with:
           sarif_file: osv-results.sarif
-          category: osv-scanner
+          category: osv-scanner-docs
         continue-on-error: true
 
       - name: Fail on osv findings
diff --git a/.github/workflows/apps-docs-security-secrets.yml b/.github/workflows/apps-docs-security-secrets.yml
index 0b6a76b8..8cba75a8 100644
--- a/.github/workflows/apps-docs-security-secrets.yml
+++ b/.github/workflows/apps-docs-security-secrets.yml
@@ -79,5 +79,5 @@ jobs:
         uses: github/codeql-action/upload-sarif@7c1e4cf0b20d7c1872b26569c00ba908797a59bf # v4
         with:
           sarif_file: gitleaks-results.sarif
-          category: gitleaks
+          category: gitleaks-docs
         continue-on-error: true
diff --git a/.github/workflows/apps-ui-security-deps.yml b/.github/workflows/apps-ui-security-deps.yml
index e5c42c4c..2ecf3a7a 100644
--- a/.github/workflows/apps-ui-security-deps.yml
+++ b/.github/workflows/apps-ui-security-deps.yml
@@ -72,7 +72,7 @@ jobs:
         uses: github/codeql-action/upload-sarif@7c1e4cf0b20d7c1872b26569c00ba908797a59bf # v4
         with:
           sarif_file: osv-results.sarif
-          category: osv-scanner
+          category: osv-scanner-ui
         continue-on-error: true
 
       - name: Fail on osv findings
diff --git a/.github/workflows/apps-ui-security-sast.yml b/.github/workflows/apps-ui-security-sast.yml
index 768a8108..a64cad1f 100644
--- a/.github/workflows/apps-ui-security-sast.yml
+++ b/.github/workflows/apps-ui-security-sast.yml
@@ -91,5 +91,5 @@ jobs:
         uses: github/codeql-action/upload-sarif@7c1e4cf0b20d7c1872b26569c00ba908797a59bf # v4
         with:
           sarif_file: semgrep-results.sarif
-          category: semgrep
+          category: semgrep-ui
         continue-on-error: true
diff --git a/.github/workflows/apps-ui-security-secrets.yml b/.github/workflows/apps-ui-security-secrets.yml
index 217e5a2f..b2e7c609 100644
--- a/.github/workflows/apps-ui-security-secrets.yml
+++ b/.github/workflows/apps-ui-security-secrets.yml
@@ -79,5 +79,5 @@ jobs:
         uses: github/codeql-action/upload-sarif@7c1e4cf0b20d7c1872b26569c00ba908797a59bf # v4
         with:
           sarif_file: gitleaks-results.sarif
-          category: gitleaks
+          category: gitleaks-ui
         continue-on-error: true
diff --git a/.github/workflows/infra-bootstrap-security-secrets.yml b/.github/workflows/infra-bootstrap-security-secrets.yml
index c7a2087f..0825c21b 100644
--- a/.github/workflows/infra-bootstrap-security-secrets.yml
+++ b/.github/workflows/infra-bootstrap-security-secrets.yml
@@ -70,5 +70,5 @@ jobs:
         uses: github/codeql-action/upload-sarif@7c1e4cf0b20d7c1872b26569c00ba908797a59bf # v4
         with:
           sarif_file: gitleaks-results.sarif
-          category: gitleaks
+          category: gitleaks-bootstrap
         continue-on-error: true
diff --git a/.github/workflows/infra-compose-security-secrets.yml b/.github/workflows/infra-compose-security-secrets.yml
index 796c0955..8b7e7bb6 100644
--- a/.github/workflows/infra-compose-security-secrets.yml
+++ b/.github/workflows/infra-compose-security-secrets.yml
@@ -79,5 +79,5 @@ jobs:
         uses: github/codeql-action/upload-sarif@7c1e4cf0b20d7c1872b26569c00ba908797a59bf # v4
         with:
           sarif_file: gitleaks-results.sarif
-          category: gitleaks
+          category: gitleaks-compose
         continue-on-error: true