diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml
index e822df087..c67ceb36d 100644
--- a/.semaphore/semaphore.yml
+++ b/.semaphore/semaphore.yml
@@ -40,13 +40,14 @@ blocks:
             - pip install confluent-release-tools -q
             - . sem-pint
             - mvn -Dcloud -Pjenkins -U -Dmaven.wagon.http.retryHandler.count=10 --batch-mode --no-transfer-progress clean verify install dependency:analyze validate
-            - . cve-scan
+            - cve-scan
             - . cache-maven store
       epilogue:
         always:
           commands:
             - . publish-test-results
             - artifact push workflow target/test-results
+            - artifact push workflow target
 
   - name: Release
     dependencies: ["Test"]
@@ -59,7 +60,7 @@ blocks:
             - mvn -Dcloud -Pjenkins -U -Dmaven.wagon.http.retryHandler.count=10 --batch-mode -DaltDeploymentRepository=confluent-codeartifact-internal::default::https://confluent-519856050701.d.codeartifact.us-west-2.amazonaws.com/maven/maven-snapshots/
               -DrepositoryId=confluent-codeartifact-internal deploy -DskipTests
   - name: Release Notes
-    dependencies: [ ]
+    dependencies: []
     run:
       when: "branch =~ '[0-9]+\\.[0-9]+\\.x'"
     task:
@@ -69,7 +70,6 @@ blocks:
             - git clone --branch master --single-branch git@github.com:confluentinc/connect-releases.git
             - ./connect-releases/tasks/release-connect-plugins/generate-connect-changelogs.sh
 
-
 after_pipeline:
   task:
     agent:
@@ -86,4 +86,5 @@ after_pipeline:
         commands:
           - checkout
           - sem-version java 11
-          - emit-sonarqube-data -a test-results
\ No newline at end of file
+          - artifact pull workflow target
+          - emit-sonarqube-data --run_only_sonar_scan
diff --git a/Jenkinsfile b/Jenkinsfile
deleted file mode 100755
index 84a36974a..000000000
--- a/Jenkinsfile
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env groovy
-common {
-  slackChannel = '#connect-warn'
-  pintMerge = true
-  downStreamValidate = false
-  nodeLabel = 'docker-oraclejdk8'
-  sonarqubeScannerEnable = true
-}
diff --git a/sonar-project.properties b/sonar-project.properties
index be656e48b..a6b710de8 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -1,8 +1,8 @@
-sonar.projectKey=kafka-connect-elasticsearch
-sonar.sources=src/main/java
-sonar.java.binaries=target/classes/**
-sonar.exclusions=**/test/**/*,**/tests/**/*,**/mock/**/*,**/mocks/**/*,**/*mock*,**/*test*
-sonar.test.inclusions=**/*Test.java,**/*IT.java
+### service-bot sonarqube plugin managed file
+sonar.coverage.exclusions=**/test/**/*,**/tests/**/*,**/mock/**/*,**/mocks/**/*,**/*mock*,**/*test*
 sonar.coverage.jacoco.xmlReportPaths=**/jacoco.xml
-sonar.java.tests.reportPaths=**/surefire/**
-sonar.language=java
\ No newline at end of file
+sonar.exclusions=**/*.pb.*,**/mk-include/**/*
+sonar.java.binaries=.
+sonar.language=java
+sonar.projectKey=kafka-connect-elasticsearch
+sonar.sources=.