diff --git a/pom.xml b/pom.xml
index f94da34..40b511a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,14 +19,23 @@
 		<!-- Global project version -->
 
 		<!-- Dependencies projects version -->
-		<sonar.skipDesign>true</sonar.skipDesign>
-		<sonar.projectBaseDir>${project.basedir}</sonar.projectBaseDir>
+		<!--<sonar.skipDesign>true</sonar.skipDesign>-->
+		<!--<sonar.projectBaseDir>${project.basedir}</sonar.projectBaseDir>-->
 		<sonar.jacoco.reportPath>${project.basedir}/target/jacoco.exec</sonar.jacoco.reportPath>
 		<nexus.proxy>https://nexus.onap.org</nexus.proxy>
 		<sitePath>/content/sites/site/org/openecomp/sdc/jtosca/${project.version}</sitePath>
 		<snapshots.path>snapshots</snapshots.path>
 		<releases.path>releases</releases.path>
 		<staging.profile.id>176c31dfe190a</staging.profile.id>
+		<!-- Sonar properties -->
+		<sonar.sourceEncoding>${project.build.sourceEncoding}</sonar.sourceEncoding>
+		<sonar.skipDesign>true</sonar.skipDesign>
+		<sonar.projectBaseDir>${project.basedir}</sonar.projectBaseDir>
+		<sonar.sources>.</sonar.sources>
+		<sonar.exclusions>**/scripts/**/*</sonar.exclusions>
+		<sonar.test.exclusions>**/test/**/*,**/tests/**/*</sonar.test.exclusions>
+		<sonar.inclusions>app/**/*.js,server-mock/**/*.js,src/**/*.js,src/main/**/*.java</sonar.inclusions>
+		<sonar.branch>${project.version}</sonar.branch>
 
 	</properties>
 
@@ -185,6 +194,11 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>org.sonarsource.scanner.maven</groupId>
+				<artifactId>sonar-maven-plugin</artifactId>
+				<version>3.0.2</version>
+			</plugin>
 		</plugins>
 	</build>