diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6807e1a45c58a92adc1b16276d1ef780513e9bb5..0a4ca39929275cdc6d6624fcfdca9b56502c571e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -67,6 +67,7 @@ code_analysis:
   stage: sonar-analysis
   only:
     - dev
+    - merge_requests
   before_script:
     - export NODE_PATH=$NODE_PATH:`npm root -g`
     - npm install -g typescript
@@ -79,7 +80,9 @@ code_analysis:
       -Dsonar.projectBaseDir=.
       -Dsonar.host.url=${SONAR_URL}
       -Dsonar.projectKey=${SONAR_PROJECT_KEY}
+      -Dsonar.exclusions=scripts/**,**/*mock.*.ts,**/*spec.ts
       -Dsonar.login=${SONAR_TOKEN}
+      -Dsonar.qualitygate.wait=true
 
 mr:
   image: docker:18.09