diff --git a/.github/workflows/addon-sonar-analysis.yml b/.github/workflows/addon-sonar-analysis.yml
index 362e43fc7..b39b26404 100644
--- a/.github/workflows/addon-sonar-analysis.yml
+++ b/.github/workflows/addon-sonar-analysis.yml
@@ -2,7 +2,7 @@ name: Addon sonar analysis
 
 on:
   pull_request:
-    paths: ['packages/addon/**']
+    paths: ['packages/addon/**', '.github/workflows/**']
     types: [opened, synchronize, reopened]
   push:
     paths: ['packages/addon/**']
@@ -36,10 +36,9 @@ jobs:
       - name: Run build wrapper
         run: build-wrapper-win-x86-64.exe --out-dir build_wrapper_output_directory cmd /c "node-gyp configure build"
 
-      # The sonar analysis does not work because the sonar project points to the node-win repo so it cannot find the PR
-      # - name: SonarQube Scan
-      #   uses: SonarSource/sonarqube-scan-action@1a6d90ebcb0e6a6b1d87e37ba693fe453195ae25 # v5.3.1
-      #   env:
-      #     SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-      #   with:
-      #     projectBaseDir: packages/addon
+      - name: SonarQube Scan
+        uses: SonarSource/sonarqube-scan-action@1a6d90ebcb0e6a6b1d87e37ba693fe453195ae25 # v5.3.1
+        env:
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        with:
+          projectBaseDir: packages/addon
diff --git a/.github/workflows/core-sonar-analysis.yml b/.github/workflows/core-sonar-analysis.yml
index 51ee6163a..c49122ac0 100644
--- a/.github/workflows/core-sonar-analysis.yml
+++ b/.github/workflows/core-sonar-analysis.yml
@@ -2,7 +2,7 @@ name: Core sonar analysis
 
 on:
   pull_request:
-    paths: ['packages/core/**']
+    paths: ['packages/core/**', '.github/workflows/**']
     types: [opened, synchronize, reopened]
   push:
     paths: ['packages/core/**']
@@ -33,10 +33,9 @@ jobs:
       - name: Run tests
         run: npm run test:cov
 
-      # The sonar analysis does not work because the sonar project points to the node-win repo so it cannot find the PR
-      # - name: SonarQube Scan
-      #   uses: SonarSource/sonarqube-scan-action@1a6d90ebcb0e6a6b1d87e37ba693fe453195ae25 # v5.3.1
-      #   env:
-      #     SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-      #   with:
-      #     projectBaseDir: packages/core
+      - name: SonarQube Scan
+        uses: SonarSource/sonarqube-scan-action@1a6d90ebcb0e6a6b1d87e37ba693fe453195ae25 # v5.3.1
+        env:
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        with:
+          projectBaseDir: packages/core