diff --git a/.github/workflows/build-sonar-report.yml b/.github/workflows/build-sonar-report.yml
new file mode 100644
index 000000000000..b9897a8aa363
--- /dev/null
+++ b/.github/workflows/build-sonar-report.yml
@@ -0,0 +1,44 @@
+# Copyright © 2024 Cask Data, Inc.
+#  Licensed under the Apache License, Version 2.0 (the "License"); you may not
+#  use this file except in compliance with the License. You may obtain a copy of
+#  the License at
+#  http://www.apache.org/licenses/LICENSE-2.0
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations under
+#  the License.
+
+# This workflow will build a Java project with Maven
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+# Note: Any changes to this workflow would be used only after merging into develop
+name: Build test coverage and Sonar Report
+
+on:
+  workflow_run:
+    workflows:
+    - Build with test coverage and Sonar
+    types:
+    - completed
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+     - name: Download artifact
+       uses: actions/download-artifact@v2
+       with:
+        name: reports-${{ github.event.workflow_run.id }}
+        path: ./downloaded-artifact
+
+     - name: Surefire Report
+       # Pinned 3.5.2 version
+       uses: mikepenz/action-junit-report@16a9560bd02f11e7e3bf6b3e2ef6bba6c9d07c32
+       if: always()
+       with:
+         report_paths: '**/target/surefire-reports/TEST-*.xml'
+         github_token: ${{ secrets.GITHUB_TOKEN }}
+         detailed_summary: true
+         commit: ${{ github.event.workflow_run.head_sha }}
+         check_name: Sonar Build Test Report
\ No newline at end of file
diff --git a/.github/workflows/build-sonar.yml b/.github/workflows/build-sonar.yml
index 01ca7bd43d31..b07f8ae58f58 100644
--- a/.github/workflows/build-sonar.yml
+++ b/.github/workflows/build-sonar.yml
@@ -15,24 +15,19 @@
 name: Build with test coverage and Sonar
 
 on:
-  workflow_run:
-    workflows:
-      - Trigger build
-    types:
-      - completed
+  push:
+    branches: [ develop, release/** ]
+  pull_request:
+    branches: [ develop, release/** ]
+    types: [opened, synchronize, reopened, labeled]
 
 jobs:
   build:
     runs-on: k8s-runner-build
 
-    if: ${{ github.event.workflow_run.conclusion != 'skipped' }}
-
     steps:
-      # Pinned 1.0.0 version
-      - uses: marocchino/action-workflow_run-status@54b6e87d6cb552fc5f36dbe9a722a6048725917a
       - uses: actions/checkout@v3
         with:
-          ref: ${{ github.event.workflow_run.head_sha }}
           submodules: recursive
       - name: Cache
         uses: actions/cache@v3
@@ -90,17 +85,7 @@ jobs:
         uses: actions/upload-artifact@v3
         if: always()
         with:
-          name: Build debug files
+          name: reports-${{ github.run_id }}
           path: |
             **/target/rat.txt
             **/target/surefire-reports/*
-      - name: Surefire Report
-        # Pinned 3.5.2 version
-        uses: mikepenz/action-junit-report@16a9560bd02f11e7e3bf6b3e2ef6bba6c9d07c32
-        if: always()
-        with:
-          report_paths: '**/target/surefire-reports/TEST-*.xml'
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          detailed_summary: true
-          commit: ${{ github.event.workflow_run.head_sha }}
-          check_name: Sonar Build Test Report