diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bcf904b074270cde4c3d103edd2e334a2b906dd4..69f9841530eff139b96bfe432773f24e3cbc3696 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,5 @@
 stages:
+  - sonar-analysis
   - build
   - deploy
 
@@ -6,6 +7,7 @@ variables:
   USER_SUPPORT_MAILBOX: alpha-test@erasme.org
   SMTP_HOST: mail0.erasme.org
   SMTP_PORT: 25
+  SONAR_URL: https://sonarqube.forge.grandlyon.com
   # ADDITIONAL_FEEDBACK_EMAILS: 
 
 build_development:
@@ -19,12 +21,28 @@ build_development:
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
     - docker-compose push
 
+sonarqube:
+  stage: sonar-analysis
+  only:
+    - development
+  before_script:
+    - export PATH=$PATH:/usr/local/bin/sonar-scanner-3.2.0.1227-linux/bin/
+    - export NODE_PATH=$NODE_PATH:`npm root -g`
+  script:
+    - >
+      sonar-scanner
+      -Dsonar.projectName=${SONAR_PROJECT_KEY}
+      -Dsonar.projectVersion=1.0
+      -Dsonar.sourceEncoding=UTF-8
+      -Dsonar.projectBaseDir=.
+      -Dsonar.host.url=${SONAR_URL}
+      -Dsonar.projectKey=${SONAR_PROJECT_KEY}
+      -Dsonar.login=${SONAR_TOKEN}
+
 build_release:
   stage: build
   only:
     - tags
-  # except:
-  #   - /^(?!master).+@/
   script:
     - export TAG=$(echo $CI_COMMIT_TAG | sed 's/v//g')
     - export MAIL_SERVICE_BIND_PORT=3000