diff --git a/.github/workflows/maven-central-publish.yml b/.github/workflows/maven-central-publish.yml
index 1ccdd85..a9008fd 100644
--- a/.github/workflows/maven-central-publish.yml
+++ b/.github/workflows/maven-central-publish.yml
@@ -10,7 +10,7 @@ jobs:
       - name: Set up Maven Central Repository
         uses: actions/setup-java@v4
         with:
-          java-version: '21'
+          java-version: '17'
           distribution: 'temurin'
           server-id: central
           server-username: MAVEN_USERNAME
diff --git a/.github/workflows/sonarcloud-checks.yml b/.github/workflows/sonarcloud-checks.yml
index 22689fd..f91b4ec 100644
--- a/.github/workflows/sonarcloud-checks.yml
+++ b/.github/workflows/sonarcloud-checks.yml
@@ -32,6 +32,8 @@ jobs:
           restore-keys: ${{ runner.os }}-m2
       - name: Build and analyze
         env:
+          USER_NAME: ${{ secrets.PPE_USER_NAME }}
+          ACCESS_TOKEN: ${{ secrets.PPE_ACCESS_TOKEN }}
           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=PhonePe_DLM
diff --git a/pom.xml b/pom.xml
index 02f2830..568a14e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,6 +84,7 @@
         <sonatype.central.publishing.maven.plugin.version>0.5.0</sonatype.central.publishing.maven.plugin.version>
         <maven.release.plugin.version>2.5.3</maven.release.plugin.version>
         <maven.gpg.plugin.version>1.6</maven.gpg.plugin.version>
+        <maven.sonar.plugin.version>3.9.1.2184</maven.sonar.plugin.version>
 
         <!-- Test related properties -->
         <mockito.version>4.3.1</mockito.version>
@@ -97,14 +98,20 @@
         <jdk.target.version>17</jdk.target.version>
         <jdk.release.version>17</jdk.release.version>
 
+        <!-- Sonar properties -->
         <sonar.projectKey>PhonePe_DLM</sonar.projectKey>
         <sonar.organization>phonepe</sonar.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
-
+        <sonar.sources>src/main</sonar.sources>
+        <sonar.tests>src/test</sonar.tests>
+        <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
+        <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
+        <sonar.language>java</sonar.language>
+        <sonar.qualitygate.wait>true</sonar.qualitygate.wait>
         <sonar.exclusions>
             <!-- Excluding test classes from sonar smells -->
-            **/src/test/com/phonepe/dlm/**/*.java,
-            **/src/test/com/phonepe/dlm/*.java
+            **/src/test/java/com/phonepe/dlm/**/*.java,
+            **/src/test/java/com/phonepe/dlm/*.java
         </sonar.exclusions>
     </properties>
 
@@ -250,9 +257,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>${maven.surefire.plugin.version}</version>
-                <configuration>
-                    <argLine>--add-opens java.base/java.nio=ALL-UNNAMED</argLine>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.sonatype.central</groupId>
@@ -275,25 +279,47 @@
                     <goals>deploy</goals>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.sonarsource.scanner.maven</groupId>
+                <artifactId>sonar-maven-plugin</artifactId>
+                <version>${maven.sonar.plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>sonar-run</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>sonar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
                 <version>${jacoco.maven.plugin.version}</version>
                 <executions>
                     <execution>
-                        <id>prepare-agent</id>
+                        <phase>initialize</phase>
                         <goals>
                             <goal>prepare-agent</goal>
                         </goals>
+                        <configuration>
+                            <append>true</append>
+                        </configuration>
                     </execution>
                     <execution>
                         <id>report</id>
-                        <phase>test</phase>
+                        <phase>prepare-package</phase>
                         <goals>
                             <goal>report</goal>
                         </goals>
                     </execution>
                 </executions>
+                <configuration>
+                    <excludes>
+                        <exclude>**/src/test/**</exclude>
+                    </excludes>
+                </configuration>
             </plugin>
         </plugins>
     </build>