diff --git a/.github/actions/get_deps/action.yml b/.github/actions/get_deps/action.yml
index ae9e7bbef..b0d6d1066 100644
--- a/.github/actions/get_deps/action.yml
+++ b/.github/actions/get_deps/action.yml
@@ -19,7 +19,10 @@ runs:
     - name: Linux dependencies
       if: runner.os == 'Linux'
       run: |
-        sudo apt install -y ninja-build
+        NINJA_URL=https://github.com/ninja-build/ninja/releases/download/v1.13.1/ninja-linux.zip
+        wget $NINJA_URL -O ninja-linux.zip
+        unzip ninja-linux.zip -d ninja-bin
+        echo >> $GITHUB_PATH "${{ github.workspace }}/ninja-bin"
       shell: bash
 
     - name: Get Dependencies
diff --git a/.github/workflows/static_analysis.yml b/.github/workflows/static_analysis.yml
index f391855f5..bbb7229df 100644
--- a/.github/workflows/static_analysis.yml
+++ b/.github/workflows/static_analysis.yml
@@ -50,7 +50,7 @@ jobs:
         with:
           category: CodeQL
           upload: always
-        id: step1
+        id: analyze
 
 #      - name: Filter out unwanted errors and warnings
 #        uses: advanced-security/filter-sarif@v1
@@ -71,15 +71,21 @@ jobs:
 #            -**/third*party/**
 #            -**/3rd*party/**
 #            -**/external/**
-#          input: ${{ steps.step1.outputs.sarif-output }}/cpp.sarif
-#          output: ${{ steps.step1.outputs.sarif-output }}/cpp.sarif
+#          input: ${{ steps.analyze.outputs.sarif-output }}/cpp.sarif
+#          output: ${{ steps.analyze.outputs.sarif-output }}/cpp.sarif
 #
 #      - name: Upload SARIF
 #        uses: github/codeql-action/upload-sarif@v4
 #        with:
-#          sarif_file: ${{ steps.step1.outputs.sarif-output }}
+#          sarif_file: ${{ steps.analyze.outputs.sarif-output }}
 #          category: CodeQL
 
+      - name: Upload artifact
+        uses: actions/upload-artifact@v5
+        with:
+          name: codeql-${{ matrix.board }}
+          path: ${{ steps.analyze.outputs.sarif-output }}
+
   PVS-Studio:
     runs-on: ubuntu-latest
     strategy:
@@ -114,14 +120,21 @@ jobs:
           cmake examples -B build -G Ninja -DBOARD=${{ matrix.board }} -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE=MinSizeRel
           cmake --build build
           pvs-studio-analyzer analyze -f build/compile_commands.json -j --exclude-path hw/mcu/ --exclude-path lib/
-          plog-converter -t sarif -o pvs.sarif PVS-Studio.log
+          plog-converter -t sarif -o pvs-${{ matrix.board }}.sarif PVS-Studio.log
 
       - name: Upload SARIF
         uses: github/codeql-action/upload-sarif@v4
         with:
-          sarif_file: pvs.sarif
+          sarif_file: pvs-${{ matrix.board }}.sarif
           category: PVS-Studio
 
+      - name: Upload artifact
+        uses: actions/upload-artifact@v5
+        with:
+          name: pvs-${{ matrix.board }}
+          path: pvs-${{ matrix.board }}.sarif
+
+
 #  SonarQube:
 #    name: Build and analyze
 #    runs-on: ubuntu-latest