diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 59edc7ce..bc3ea61c 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -41,29 +41,75 @@ jobs:
     uses: ./.github/workflows/backwards-compatibility-test.yml
 
   # Test sonarcloud analysis
-  # pr-analysis:
-  #   name: SonarCloud Pr Analysis
-  #   runs-on: ubuntu-latest
-  #   needs: pr-test
-  #   steps:
-  #     - uses: actions/checkout@v4
-  #       with:
-  #         fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
-  #     # Download reports
-  #     - uses: ./.github/actions/download-coverage-report
-  #     - uses: ./.github/actions/download-lint-report
-  #     - name: 'Verify reports'
-  #       run: |
-  #         pwd
-  #         echo 'Lint report'
-  #         ls -la ./coverage/packages/ngx-deploy-npm/lcov.info
-  #         echo 'Coverage report'
-  #         ls -la ./reports/ngx-deploy-npm/lint-report.info
-  #     - name: SonarCloud Scan
-  #       uses: SonarSource/sonarqube-scan-action@v4.2.1
-  #       env:
-  #         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
-  #         SONAR_TOKEN: ${{ secrets.SONARQUBE_SCANNER }}
-  #       with:
-  #         args: >
-  #           -Dsonar.pullrequest.key=${{ github.env.PR_NUMBER }}
+  pr-analysis:
+    name: SonarCloud Pr Analysis
+    runs-on: ubuntu-latest
+    needs: pr-test
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
+
+      # Download reports
+      - name: 'Download reports'
+        uses: actions/github-script@v6
+        with:
+          script: |
+            async function downloadArtifact(artifactName) {
+              console.log(`Looking for artifact: ${artifactName}`);
+              let allArtifacts = await github.rest.actions.listWorkflowRunArtifacts({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                run_id: context.payload.workflow_run.id,
+              });
+              console.log('Available artifacts:', allArtifacts.data.artifacts.map(a => a.name));
+
+              let matchArtifact = allArtifacts.data.artifacts.find((artifact) => {
+                return artifact.name === artifactName;
+              });
+
+              if (!matchArtifact) {
+                throw new Error(`Artifact "${artifactName}" not found!`);
+              }
+
+              let download = await github.rest.actions.downloadArtifact({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                artifact_id: matchArtifact.id,
+                archive_format: 'zip',
+              });
+
+              let fs = require('fs');
+              fs.writeFileSync(`${process.env.GITHUB_WORKSPACE}/${artifactName}.zip`, Buffer.from(download.data));
+              return artifactName;
+            }
+
+            // Download both artifacts
+            await Promise.all([
+              downloadArtifact('ngx-deploy-npm-coverage-report'),
+              downloadArtifact('lint-report')
+            ]);
+      - name: 'Extract reports'
+        run: |
+          # Extract coverage report
+          mkdir -p coverage/packages/ngx-deploy-npm
+          unzip ngx-deploy-npm-coverage-report.zip -d coverage/packages/ngx-deploy-npm
+          # Extract lint report
+          mkdir -p reports
+          unzip lint-report.zip -d reports
+
+      - name: 'Verify reports'
+        run: |
+          pwd
+          echo 'Lint report'
+          ls -la ./coverage/packages/ngx-deploy-npm/lcov.info
+          echo 'Coverage report'
+          ls -la ./reports/ngx-deploy-npm/lint-report.info
+      - name: SonarCloud Scan
+        uses: SonarSource/sonarqube-scan-action@v4.2.1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
+          SONAR_TOKEN: ${{ secrets.SONARQUBE_SCANNER }}
+        with:
+          args: >
+            -Dsonar.pullrequest.key=${{ github.env.PR_NUMBER }}
diff --git a/.github/workflows/sonar-pr.yml b/.github/workflows/sonar-pr.yml
index 977d4a63..8d984d33 100644
--- a/.github/workflows/sonar-pr.yml
+++ b/.github/workflows/sonar-pr.yml
@@ -35,8 +35,52 @@ jobs:
             JSON.stringify(${{ github.event.workflow_run }}, null, 2)
 
       # Download reports
-      - uses: ./.github/actions/download-coverage-report
-      - uses: ./.github/actions/download-lint-report
+      - name: 'Download reports'
+        uses: actions/github-script@v6
+        with:
+          script: |
+            async function downloadArtifact(artifactName) {
+              console.log(`Looking for artifact: ${artifactName}`);
+              let allArtifacts = await github.rest.actions.listWorkflowRunArtifacts({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                run_id: context.payload.workflow_run.id,
+              });
+              console.log('Available artifacts:', allArtifacts.data.artifacts.map(a => a.name));
+
+              let matchArtifact = allArtifacts.data.artifacts.find((artifact) => {
+                return artifact.name === artifactName;
+              });
+
+              if (!matchArtifact) {
+                throw new Error(`Artifact "${artifactName}" not found!`);
+              }
+
+              let download = await github.rest.actions.downloadArtifact({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                artifact_id: matchArtifact.id,
+                archive_format: 'zip',
+              });
+
+              let fs = require('fs');
+              fs.writeFileSync(`${process.env.GITHUB_WORKSPACE}/${artifactName}.zip`, Buffer.from(download.data));
+              return artifactName;
+            }
+
+            // Download both artifacts
+            await Promise.all([
+              downloadArtifact('ngx-deploy-npm-coverage-report'),
+              downloadArtifact('lint-report')
+            ]);
+      - name: 'Extract reports'
+        run: |
+          # Extract coverage report
+          mkdir -p coverage/packages/ngx-deploy-npm
+          unzip ngx-deploy-npm-coverage-report.zip -d coverage/packages/ngx-deploy-npm
+          # Extract lint report
+          mkdir -p reports
+          unzip lint-report.zip -d reports
 
       - name: SonarCloud Scan
         uses: SonarSource/sonarqube-scan-action@v4.2.1