diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d9afff956..a3d1574ee 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -203,16 +203,15 @@ jobs:
       - name: "Checkout"
         uses: "actions/checkout@v3"
         with:
-          fetch-depth: 2
+          ref: ${{ github.event.pull_request.head.sha }}  # to check out the actual pull request commit, not the merge commit
+          fetch-depth: 0  # a full history is required for pull request analysis
 
-      - name: "Qodana Analysis"
-        run: |
-          docker run \
-            -v $(pwd):/data/project \
-            -v $(pwd)/tests/output/:/data/results/ \
-            -e QODANA_TOKEN="${{ secrets.QODANA_TOKEN }}" \
-            jetbrains/qodana-php:latest \
-            --show-report --baseline=qodana.sarif.json
+      - name: 'Qodana Scan'
+        uses: JetBrains/qodana-action@v2023.2
+        with:
+          args: --baseline,qodana.sarif.json
+        env:
+          QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}
 
       - name: Upload Code Coverage Report
         uses: codecov/codecov-action@v3