diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8e34452..e1e93a9 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -20,12 +20,10 @@ jobs:
         gradle-version: 6.7
     - name: Copy Dependencies
       run: gradle katalonCopyDependencies
-    - name: Setup Java
-      uses: actions/setup-java@v3
-      with:
-        distribution: temurin
-        java-version: '11'
-    - name: Setup Gradle
-      uses: gradle/gradle-build-action@v2
-    - name: Sonar scan
-      run:  gradle sonar -Dsonar.host.url=https://sonarcloud.io -Dsonar.verbose=true
\ No newline at end of file
+    - name: Plugin Package
+      run: gradle katalonPluginPackage
+    - name: SonarCloud Scan
+      uses: sonarsource/sonarcloud-github-action@master
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
diff --git a/.gitignore b/.gitignore
index f84ca26..604587d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,4 +21,7 @@ build
 Drivers/katalon_generated_*
 Libs
 settings
-Reports
\ No newline at end of file
+Reports
+
+#Sonar
+.scannerwork
diff --git a/build.gradle b/build.gradle
index e68c6ad..301cae3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,6 @@ plugins {
   id 'groovy'
   id 'com.github.johnrengelman.shadow' version '4.0.4'
   id "com.katalon.gradle-plugin" version "0.0.7"
-  id("org.sonarqube") version "4.0.0.2929"
 }
 
 repositories {
@@ -60,7 +59,8 @@ dependencies {
     exclude group: 'org.olap4j'
     exclude group: 'xml-apis'
   }
-  compile 'dom4j:dom4j:1.6.1'
   compile 'net.sf.jasperreports:jasperreports-fonts:6.0.0'
-  compile 'commons-collections:commons-collections:3.2.2'
-}
\ No newline at end of file
+  // TODO how to externalize these jar files for a complete indenpendent build?
+  compileOnly(fileTree('/Applications/Katalon Studio.app/Contents/Eclipse/plugins') { include('*.jar') })
+  compileOnly(fileTree('/Applications/Katalon Studio.app/Contents/Eclipse/configuration/resources/lib') { include('*.jar') })
+}
diff --git a/sonar-project.properties b/sonar-project.properties
new file mode 100644
index 0000000..b37f034
--- /dev/null
+++ b/sonar-project.properties
@@ -0,0 +1,4 @@
+sonar.host.url=https://sonarcloud.io
+sonar.projectKey=katalon-studio_katalon-studio-basic-report-plugin
+sonar.sources=Keywords,Test Listeners,Include/scripts/groovy
+sonar.java.binaries=build