diff --git a/.gitignore b/.gitignore
index 4530cfd80431f..9ed4dde887458 100644
--- a/.gitignore
+++ b/.gitignore
@@ -110,3 +110,4 @@ bazel-selenium
 bazel-testlogs
 
 /.vscode/
+/.scannerwork/
diff --git a/sonar-project.properties b/sonar-project.properties
index 6e3757b47f8b3..f6b17bda85827 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -6,11 +6,15 @@ sonar.sourceEncoding=UTF-8
 sonar.modules=java_client,java_server
 
 java_client.sonar.projectName=Java Client
-java_client.sonar.projectBaseDir=java/client
-java_client.sonar.sources=src
-java_client.sonar.tests=test
+java_client.sonar.projectBaseDir=.
+java_client.sonar.sources=java/client/src
+java_client.sonar.tests=java/client/test
+java_client.sonar.java.binaries=bazel-bin/java/client/src
+java_client.sonar.inclusions=**/*.java
 
 java_server.sonar.projectName=Java Server
-java_server.sonar.projectBaseDir=java/server
-java_server.sonar.sources=src
-java_server.sonar.tests=test
+java_server.sonar.projectBaseDir=.
+java_server.sonar.sources=java/server/src
+java_server.sonar.tests=java/server/test
+java_server.sonar.java.binaries=bazel-bin/java/server/src
+java_server.sonar.inclusions=**/*.java