diff --git a/.github/workflows/sonarqube.yaml b/.github/workflows/sonarqube.yaml
index d84a10b2..10e8fc9a 100644
--- a/.github/workflows/sonarqube.yaml
+++ b/.github/workflows/sonarqube.yaml
@@ -1,6 +1,10 @@
 name: SonarCloud
 
-on: [push]
+on:
+  push:
+    branches: '**'
+  pull_request:
+    branches: '**'
 
 jobs:
   sonarcloud:
@@ -25,9 +29,9 @@ jobs:
       uses: seanmiddleditch/gha-setup-ninja@master
 
     - name: Setup SonarScanner
-      uses: warchant/setup-sonar-scanner@v3
+      uses: warchant/setup-sonar-scanner@v7
       with:
-        version: 4.6.0.2311
+        version: 4.1
 
     - name: Install Build Wrapper
       run: |
@@ -45,17 +49,17 @@ jobs:
     - name: Run SonarCloud Scan
       run: |
           sonar-scanner \
-          -Dsonar.branch.name="${GITHUB_REF_NAME}" \
+          -Dsonar.branch.name=master \
           -Dsonar.cfamily.build-wrapper-output=build-wakaama/sonar-cloud-build-wrapper-output \
           -Dsonar.cfamily.cache.enabled=false \
           -Dsonar.cfamily.gcov.reportsPath=build-wakaama \
           -Dsonar.cfamily.threads=2 \
           -Dsonar.exclusions="build-wakaama-*/**, .git/**" \
           -Dsonar.host.url=https://sonarcloud.io \
-          -Dsonar.login=${{ secrets.SONAR_TOKEN }} \
           -Dsonar.organization=${{ github.repository_owner }} \
           -Dsonar.projectKey="$(echo ${{ github.repository }} | tr / _)" \
           -Dsonar.sourceEncoding=UTF-8 \
           -Dsonar.sources=.
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}