diff --git a/Jenkinsfile b/Jenkinsfile
index 6ac04623dfee64bde7184fc6102987489aab714b..a8b1efd39a2e1d5db7527edf4e7a6e4b09af2a5d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -34,8 +34,13 @@ pipeline {
                             else {
                                 sh 'npm run ci-build'
                             }
-                            withSonarQubeEnv('sonarqube'){
-                                sh 'npm run ci-sonar'
+
+                            sh 'npm run ci-test'
+
+                            if (env.BRANCH_NAME == 'master') {
+                                withSonarQubeEnv('sonarqube'){
+                                    sh 'npm run ci-sonar'
+                                }
                             }
                         }
                     }
@@ -54,13 +59,16 @@ pipeline {
                     FAILED_STAGE=env.STAGE_NAME
                 }
                 container("maven-11"){
-                    withSonarQubeEnv('sonarqube'){
-                        configFileProvider([configFile(fileId: '9aac2fac-7d8d-4128-846b-0a61951df703', variable: 'MAVEN_SETTINGS')]) {
-	                        sh 'mvn --version'
-    	                    sh 'mvn -s $MAVEN_SETTINGS -pl -goofy-client clean install'
+                    configFileProvider([configFile(fileId: '9aac2fac-7d8d-4128-846b-0a61951df703', variable: 'MAVEN_SETTINGS')]) {
+                        sh 'mvn --version'
+                        sh 'mvn -s $MAVEN_SETTINGS -pl -goofy-client clean install'
+
+                        if (env.BRANCH_NAME == 'master') {
     	                    dir('goofy-server'){
-        	                    sh 'mvn sonar:sonar'
-    	                    }
+                                withSonarQubeEnv('sonarqube'){
+                                    sh 'mvn sonar:sonar'
+                                }
+                            }
 		                }
                     }
                 }
diff --git a/goofy-client/package.json b/goofy-client/package.json
index b5a012a554ca5e0fadc713774a2d60658e874591..fcac71a00b7a1c2d0fedecf4dc47d2853f53e93f 100644
--- a/goofy-client/package.json
+++ b/goofy-client/package.json
@@ -16,7 +16,7 @@
     "ci-build": "ng build --outputHashing=all",
     "ci-prodBuild": "ng build --prod --outputHashing=all",
     "ci-test": "jest test a --ci --coverage --testResultsProcessor='jest-sonar-reporter'",
-    "ci-sonar": "npm run ci-test && sonar-scanner",
+    "ci-sonar": "sonar-scanner",
     "lint": "nx workspace-lint && ng lint",
     "affected:apps": "nx affected:apps",
     "affected:libs": "nx affected:libs",