diff --git a/.github/actions/golangci-lint/action.yml b/.github/actions/golangci-lint/action.yml
index 73ae4add53b..d8d2936a6e5 100644
--- a/.github/actions/golangci-lint/action.yml
+++ b/.github/actions/golangci-lint/action.yml
@@ -57,16 +57,16 @@ runs:
       with:
         version: v1.62.2
         only-new-issues: true
-        args: --out-format colored-line-number,checkstyle:${{ steps.set-working-directory.outputs.golangci-lint-working-directory }}_golangci-lint-report.xml -v
+        args: --out-format colored-line-number,checkstyle:golangci-lint-report.xml -v
         working-directory: ${{ steps.set-working-directory.outputs.golangci-lint-working-directory }}
     - name: Print lint report artifact
       if: failure()
-      shell: bashc
-      run: cat ./${{ inputs.go-directory }}/${{ steps.set-working-directory.outputs.golangci-lint-working-directory }}_golangci-lint-report.xml
+      shell: bash
+      run: cat ./${{ inputs.go-directory }}/golangci-lint-report.xml
     - name: Store lint report artifact
       if: always()
       uses: actions/upload-artifact@v4.4.3
       with:
         name: golangci-lint-report-${{ inputs.go-directory }}
         # The ./ is needed to preserve the valid pattern for the artifact path
-        path: ./${{ inputs.go-directory }}/${{ inputs.go-directory }}_golangci-lint-report.xml
+        path: ./${{ inputs.go-directory }}/golangci-lint-report.xml
diff --git a/.github/workflows/ci-core.yml b/.github/workflows/ci-core.yml
index 9859c1ad895..702e7030df4 100644
--- a/.github/workflows/ci-core.yml
+++ b/.github/workflows/ci-core.yml
@@ -397,7 +397,7 @@ jobs:
 
   scan:
     name: SonarQube Scan
-    needs: [core]
+    needs: [core, golangci]
     if: ${{ always() && github.actor != 'dependabot[bot]' }}
     runs-on: ubuntu-latest
     steps:
@@ -413,6 +413,9 @@ jobs:
         shell: bash
         run: |
           # Check and assign paths for coverage/test reports in go_core_tests_logs
+          sonarqube_coverage_report_paths=""
+          sonarqube_tests_report_paths=""
+          sonarqube_lint_report_paths=""
           if [ -d "go_core_tests_logs" ]; then
             sonarqube_coverage_report_paths=$(find go_core_tests_logs -name coverage.txt | paste -sd "," -)
             sonarqube_tests_report_paths=$(find go_core_tests_logs -name output.txt | paste -sd "," -)
@@ -431,7 +434,7 @@ jobs:
           fi
 
           # Check and assign paths for lint reports
-          if [ -d "golangci-lint-report" ]; then
+          if [[ -d "golangci-lint-report"* ]]; then 
             sonarqube_lint_report_paths=$(find -type f -name 'golangci-lint-report.xml' -printf "%p,")
           else
             sonarqube_lint_report_paths=""