diff --git a/jjb/nonrtric-plt-ranpm/nonrtric-plt-ranpm.yaml b/jjb/nonrtric-plt-ranpm/nonrtric-plt-ranpm.yaml
index 4f429cc..ebf532d 100644
--- a/jjb/nonrtric-plt-ranpm/nonrtric-plt-ranpm.yaml
+++ b/jjb/nonrtric-plt-ranpm/nonrtric-plt-ranpm.yaml
@@ -151,10 +151,11 @@
       sonar.projectName={project-name}
       sonar.build.sourceEncoding=UTF-8
       sonar.language=go
-      sonar.sources=.
+      sonar.sources=pm-file-converter
+      sonar.tests=pm-file-converter
       sonar.go.coverage.reportPaths=pm-file-converter/coverage.txt
-      sonar.inclusions=pm-file-converter/main.go,pm-file-converter/common/**/**.go,pm-file-converter/components/**/**.go
-      sonar.exclusions=pm-file-converter/components/xmltransform/xmltransform_test.go
+      sonar.inclusions=**/*.go
+      sonar.exclusions=**/*_test.go
     jobs:
       - gerrit-sonar-prescan-script
 
diff --git a/jjb/nonrtric-plt-ranpm/sonar-project.properties b/jjb/nonrtric-plt-ranpm/sonar-project.properties
deleted file mode 100644
index 2910b5d..0000000
--- a/jjb/nonrtric-plt-ranpm/sonar-project.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-# Required metadata
-sonar.login={sonarcloud_api_token}
-sonar.projectKey={sonarcloud_project_organization}_{project-name}
-sonar.organization={sonarcloud_project_organization}
-# Encoding
-sonar.build.sourceEncoding=UTF-8
-# Language
-sonar.language=go
-# Source
-sonar.sources=.
-# Unit tests
-sonar.go.coverage.reportPaths=pm-file-converter/coverage.txt
-# Inclusions
-sonar.inclusions=pm-file-converter/main.go,pm-file-converter/common/**/**.go,pm-file-converter/components/**/**.go
-# Exclusions
-sonar.exclusions=pm-file-converter/components/**/*_test.go,pm-file-converter/common/**/*_test.go,pm-file-converter/components/**/*_test.go