diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml
index bace7f29f..67110b8ae 100644
--- a/.github/workflows/analysis.yml
+++ b/.github/workflows/analysis.yml
@@ -56,16 +56,16 @@ jobs:
       - name: Configure
         run: |
           cmake .
-      - name: Sonarcloud Analysis
+      - name: Sonar Build Wrapper
         if: ${{ github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository }}
         run: |
           wget -q https://sonarcloud.io/static/cpp/build-wrapper-linux-x86.zip
           unzip build-wrapper-linux-x86.zip
           ./build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir bw-output make all
-          wget -q https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-5.0.1.3006-linux.zip
-          unzip -qq -o sonar-scanner-cli-5.0.1.3006-linux.zip
-          chmod +x sonar-scanner-5.0.1.3006-linux/bin/sonar-scanner
-          sonar-scanner-5.0.1.3006-linux/bin/sonar-scanner -Dproject.settings=tools/sonar/sonar-project.properties
+      - uses: sonarsource/sonarcloud-github-action@49e6cd3b187936a73b8280d59ffd9da69df63ec9 # v2.1.1
+        with:
+          args: >
+            -Dproject.settings=tools/sonar/sonar-project.properties
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}