diff --git a/.github/workflows/build-sonar.yml b/.github/workflows/build-sonar.yml
new file mode 100644
index 0000000..57c9a14
--- /dev/null
+++ b/.github/workflows/build-sonar.yml
@@ -0,0 +1,86 @@
+#  Copyright © 2020 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 with test coverage and Sonar
+
+on:
+  workflow_run:
+    workflows:
+      - Trigger build
+    types:
+      - completed
+
+jobs:
+  build:
+    runs-on: k8s-runner-build
+
+    if: ${{ github.event.workflow_run.conclusion != 'skipped' }}
+
+    steps:
+      # Pinned 1.0.0 version
+      - uses: haya14busa/action-workflow_run-status@967ed83efa565c257675ed70cfe5231f062ddd94
+
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.workflow_run.head_sha }}
+          submodules: recursive
+
+      - name: Cache
+        uses: actions/cache@v3
+        with:
+          path: ~/.m2/repository11
+          key: ${{ runner.os }}-maven-${{ github.workflow }}-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-${{ github.workflow }}
+
+      - name: Cache SonarCloud packages
+        uses: actions/cache@v3
+        with:
+          path: ~/.sonar/cache
+          key: ${{ runner.os }}-sonar
+          restore-keys: ${{ runner.os }}-sonar
+
+      - name: Build with Maven
+        run: >-
+          mvn clean verify -fae -T 2 -B -V -Dmaven.test.failure.ignore
+          -Dmaven.repo.local=$HOME/.m2/repository11
+          -DcloudBuild
+          -Pcoverage
+          -Dmaven.wagon.http.retryHandler.count=3
+          -Dmaven.wagon.httpconnectionManager.ttlSeconds=25
+
+
+      - name: Validate PR
+        id: validate_pr
+        # For whatever reason we get PR 69 for develop branch with both head and base as develop.
+        if: ${{ github.event.workflow_run.pull_requests[0].head.ref != github.event.workflow_run.pull_requests[0].base.ref }}
+        run: |
+          echo ":set-output pr-key=${{ github.event.workflow_run.pull_requests[0].number }}"
+          echo ":set-output pr-branch=${{ github.event.workflow_run.pull_requests[0].head.ref }}"
+          echo ":set-output pr-base=${{ github.event.workflow_run.pull_requests[0].base.ref }}"
+
+      - name: Sonar report
+        env:
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+          JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
+        run: >-
+          mvn org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -fae -T 2 -B -V
+          -DcloudBuild
+          -Pcoverage
+          -Dmaven.wagon.http.retryHandler.count=3
+          -Dmaven.wagon.httpconnectionManager.ttlSeconds=25
+          -Dsonar.pullrequest.key=${{ steps.validate_pr.outputs.pr-key }}
+          -Dsonar.pullrequest.branch=${{ steps.validate_pr.outputs.pr-branch }}
+          -Dsonar.pullrequest.base=${{ steps.validate_pr.outputs.pr-base }}
+          -Dsonar.branch.name=${{ github.event.workflow_run.head_branch }}
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1c52c72..3334b79 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -43,8 +43,40 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-maven-${{ github.workflow }}
 
+      - name: Cache SonarCloud packages
+        uses: actions/cache@v3
+        with:
+          path: ~/.sonar/cache
+          key: ${{ runner.os }}-sonar
+          restore-keys: ${{ runner.os }}-sonar
+
       - name: Build with Maven
-        run: mvn clean compile test -fae -T 2 -B -V -DcloudBuild -Dmaven.wagon.http.retryHandler.count=3 -Dmaven.wagon.httpconnectionManager.ttlSeconds=25
+        run: mvn clean verify -fae -T 2 -B -V -DcloudBuild -Dmaven.wagon.http.retryHandler.count=3 -Dmaven.wagon
+        .httpconnectionManager.ttlSeconds=25
+
+      - name: Validate PR
+        id: validate_pr
+        # For whatever reason we get PR 69 for develop branch with both head and base as develop.
+        if: ${{ github.event.workflow_run.pull_requests[0].head.ref != github.event.workflow_run.pull_requests[0].base.ref }}
+        run: |
+          echo ":set-output pr-key=${{ github.event.workflow_run.pull_requests[0].number }}"
+          echo ":set-output pr-branch=${{ github.event.workflow_run.pull_requests[0].head.ref }}"
+          echo ":set-output pr-base=${{ github.event.workflow_run.pull_requests[0].base.ref }}"
+
+      - name: Sonar report
+        env:
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+          JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
+        run: >-
+          mvn org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -fae -T 2 -B -V
+          -DcloudBuild
+          -Pcoverage
+          -Dmaven.wagon.http.retryHandler.count=3
+          -Dmaven.wagon.httpconnectionManager.ttlSeconds=25
+          -Dsonar.pullrequest.key=${{ steps.validate_pr.outputs.pr-key }}
+          -Dsonar.pullrequest.branch=${{ steps.validate_pr.outputs.pr-branch }}
+          -Dsonar.pullrequest.base=${{ steps.validate_pr.outputs.pr-base }}
+          -Dsonar.branch.name=${{ github.event.workflow_run.head_branch }}
 
       - name: Archive build artifacts
         uses: actions/upload-artifact@v3
diff --git a/pom.xml b/pom.xml
index cb83ac6..89f9bc1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,6 +64,15 @@
     <slf4j.version>1.7.25</slf4j.version>
     <jacoco.version>0.8.8</jacoco.version>
 
+    <sonar.organization>data-integrations</sonar.organization>
+    <sonar.projectKey>${sonar.organization}_${project.artifactId}</sonar.projectKey>
+    <sonar.host.url>https://sonarcloud.io</sonar.host.url>
+    <sonar.coverage.jacoco.xmlReportPaths>
+      ${maven.multiModuleProjectDirectory}/delta-coverage/target/site/jacoco-aggregate/jacoco.xml
+    </sonar.coverage.jacoco.xmlReportPaths>
+    <!-- We need next line to ensure generated classes are analyzed -->
+    <sonar.scm.exclusions.disabled>true</sonar.scm.exclusions.disabled>
+
     <!-- Need default value when coverage is not collected -->
     <argLine />
   </properties>