diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
deleted file mode 100644
index f668817031..0000000000
--- a/.github/workflows/build.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-name: Build
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-    types: [opened, synchronize, reopened]
-jobs:
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
-        with:
-          java-version: 11
-      - name: Cache SonarCloud packages
-        uses: actions/cache@v1
-        with:
-          path: ~/.sonar/cache
-          key: ${{ runner.os }}-sonar
-          restore-keys: ${{ runner.os }}-sonar
-      - name: Cache Maven packages
-        uses: actions/cache@v1
-        with:
-          path: ~/.m2
-          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-m2
-      - name: Build and analyze
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=oracle_weblogic-deploy-tooling
diff --git a/Jenkinsfile b/Jenkinsfile
index 9d9ca08767..8023607e83 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -13,12 +13,7 @@ pipeline {
                 jdk 'jdk8'
             }
             steps {
-                sh '''
-                    echo "PATH = ${PATH}"
-                    echo "JAVA_HOME = ${JAVA_HOME}"
-                    echo "M2_HOME = ${M2_HOME}"
-                    mvn --version
-                '''
+                sh 'env|sort'
             }
         }
         stage ('Build') {
@@ -42,7 +37,7 @@ pipeline {
                 }
             }
             steps {
-                sh 'mvn -Dunit-test-wlst-dir=${WLST_DIR} test'
+                sh 'mvn -B -Dunit-test-wlst-dir=${WLST_DIR} test'
             }
             post {
                 always {
@@ -67,7 +62,7 @@ pipeline {
                 }
             }
             steps {
-                sh 'mvn -DskipITs=false -Dmw_home=${ORACLE_HOME} -Ddb.use.container.network=true verify'
+                sh 'mvn -B -DskipITs=false -Dmw_home=${ORACLE_HOME} -Ddb.use.container.network=true verify'
             }
             post {
                 always {
@@ -75,7 +70,26 @@ pipeline {
                 }
             }
         }
-       stage ('Alias Test') {
+        stage ('Analyze') {
+            when {
+                anyOf {
+                    changeRequest()
+                    branch "main"
+                }
+            }
+            tools {
+                maven 'maven-3.6.0'
+                jdk 'jdk11'
+            }
+            steps {
+                withSonarQubeEnv('SonarCloud') {
+                    withCredentials([string(credentialsId: 'encj_github_token', variable: 'GITHUB_TOKEN')]) {
+                        runSonarScanner()
+                    }
+                }
+            }
+        }
+        stage ('Alias Test') {
             // only run this stage when triggered by a cron timer and the commit does not have []skip-ci in the message
             // for example, only run integration tests during the timer triggered nightly build
             when {
@@ -129,6 +143,24 @@ pipeline {
                 '''
             }
         }
+    }
+}
 
+void runSonarScanner() {
+    def changeUrl = env.CHANGE_URL.split("/")
+    def org = changeUrl[3]
+    def repo = changeUrl[4]
+    if (changeRequest()) {
+        sh "mvn -B sonar:sonar \
+            -Dsonar.projectKey=${org}_${repo} \
+            -Dsonar.pullrequest.provider=GitHub \
+            -Dsonar.pullrequest.github.repository=${org}/${repo} \
+            -Dsonar.pullrequest.key=${env.CHANGE_ID} \
+            -Dsonar.pullrequest.branch=${env.CHANGE_BRANCH} \
+            -Dsonar.pullrequest.base=${env.CHANGE_TARGET}"
+    } else {
+       sh "mvn -B sonar:sonar \
+           -Dsonar.projectKey=${org}_${repo} \
+           -Dsonar.branch.name=${env.BRANCH_NAME}"
     }
 }
diff --git a/core/pom.xml b/core/pom.xml
index 5ddc75ccc2..f54136cf62 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -88,6 +88,10 @@
             </resource>
         </resources>
         <plugins>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
@@ -163,10 +167,6 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>flatten-maven-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/pom.xml b/pom.xml
index 8174a79be2..4b6c34a46e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,8 +51,11 @@
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
         <sonar.sources>src/main</sonar.sources>
         <sonar.java.source>7</sonar.java.source>
+        <sonar.python.version>2</sonar.python.version>
         <sonar.exclusions>.flattened-pom.xml,target/**</sonar.exclusions>
-        <sonar.test.exclusions>src/test/**</sonar.test.exclusions>
+        <sonar.test.exclusions>core/src/test/**</sonar.test.exclusions>
+        <sonar.coverage.jacoco.xmlReportPaths>core/target/site/jacoco/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
+
         <unit-test-wlst-dir>${env.WLST_DIR}</unit-test-wlst-dir>
         <skipITs>true</skipITs>
         <alias-test-skipITs>true</alias-test-skipITs>
@@ -152,10 +155,6 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
                     <version>3.0.0-M5</version>
-                    <configuration>
-                        <!-- Created by jacoco plugin (inherited configuration) -->
-                        <argLine>${surefireArgLine}</argLine>
-                    </configuration>
                 </plugin>
                 <plugin>
                     <groupId>io.rhpatrick.mojo</groupId>
@@ -183,25 +182,17 @@
                     <version>0.8.7</version>
                     <executions>
                         <execution>
-                            <id>pre-unit-test</id>
+                            <id>prepare-agent</id>
                             <goals>
                                 <goal>prepare-agent</goal>
                             </goals>
-                            <configuration>
-                                <destFile>${sonar.jacoco.reportPath}</destFile>
-                                <propertyName>surefireArgLine</propertyName>
-                            </configuration>
                         </execution>
                         <execution>
-                            <id>post-unit-test</id>
-                            <phase>site</phase>
+                            <id>report</id>
+                            <phase>post-integration-test</phase>
                             <goals>
                                 <goal>report</goal>
                             </goals>
-                            <configuration>
-                                <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
-                                <dataFile>${sonar.jacoco.reportPath}</dataFile>
-                            </configuration>
                         </execution>
                     </executions>
                 </plugin>