diff --git a/.github/workflows/qodana-analysis.yml b/.github/workflows/qodana-analysis.yml
index cca365721..d39cde8a4 100644
--- a/.github/workflows/qodana-analysis.yml
+++ b/.github/workflows/qodana-analysis.yml
@@ -9,25 +9,39 @@ on:
 
 jobs:
   qodana:
+    strategy:
+      matrix:
+        minecraft: [1.16.5]
     runs-on: self-hosted
     steps:
       - uses: actions/checkout@v3
+      - run: mkdir -p nms-build/.m2/repository
+      - name: Restore cached NMS
+        id: cache-nms-restore
+        uses: actions/cache/restore@v4
         with:
-          fetch-depth: 0
-      - name: Set up Maven
-        uses: stCarolas/setup-maven@v5
-        with:
-          maven-version: 3.8.2
+          path: |
+            nms-build/.m2/repository
+          key: nms-spigot-${{ matrix.minecraft }}
       - uses: PeyaPeyaPeyang/nmsaction@v3
-        if: "steps.sj.outputs.cache-hit != 'true'"
+        if: "steps.cache-nms-restore.outputs.cache-hit != 'true'"
+        with:
+          rev: ${{ matrix.minecraft }}
+      - name: Save NMS to cache
+        id: cache-nms-save
+        uses: actions/cache/save@v4
         with:
-          rev: 1.16.5
-      - name: Install nms into m2
-        if: "steps.sj.outputs.cache-hit != 'true'"
+          path: |
+            nms-build/.m2/repository
+          key: nms-spigot-${{ matrix.minecraft }}
+      - name: Retrieve the absolute path of .m2
+        id: m2-path
         run: |
-          mkdir -p $HOME/.m2/repository
-          cp -a nms-build/.m2/repository/. $HOME/.m2/repository
+          M2_PATH=$(pwd)/nms-build/.m2/repository
+          echo "m2-path=$M2_PATH" >> $GITHUB_OUTPUT
       - name: 'Qodana Scan'
         uses: JetBrains/qodana-action@main
+        with:
+          args: --volume,${{ steps.m2-path.outputs.m2-path }}:/root/.m2/repository
         env:
           QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}