diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 29ac3f8f0b7dd6..8a33e694151b40 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -120,9 +120,6 @@ jobs:
         uses: github/codeql-action/analyze@v2
         with:
           category: "/language:${{matrix.language}}"
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
-        with:
           upload: False
           output: sarif-results
   
@@ -132,17 +129,17 @@ jobs:
           patterns: |
             -**/third_party/**
             -**/scripts/**
-          input: sarif-results/cpp.sarif
-          output: sarif-results/cpp.sarif
+          input: "sarif-results/${{matrix.language}}.sarif"
+          output: "sarif-results/${{matrix.language}}.sarif"
   
       - name: Upload SARIF
         uses: github/codeql-action/upload-sarif@v2
         with:
-          sarif_file: sarif-results/java.sarif
+          sarif_file: "sarif-results/${{matrix.language}}.sarif"
   
       - name: Upload loc as a Build Artifact
         uses: actions/upload-artifact@v2.2.0
         with:
           name: sarif-results
           path: sarif-results
-          retention-days: 1
\ No newline at end of file
+          retention-days: 1