diff --git a/.gitlab-ci-env.sh b/.gitlab-ci-env.sh
index 7ad89a4e20f49c49179e84d600b661481dd2dbae..9fc606489b9e80794502328f3b18cac39118e4eb 100755
--- a/.gitlab-ci-env.sh
+++ b/.gitlab-ci-env.sh
@@ -5,9 +5,7 @@
 # these paths may depend on the runner used, please be careful and add
 # the necessary if blocks depending on the machine
 
-export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
-export PATH=/builds/sonar/lcov-to-cobertura-xml-1.6/lcov_cobertura:$PATH
-export PATH=/builds/sonar/sonar-scanner-2.9.0.670/bin:$PATH
+. /etc/profile.d/spack.sh
 
 export QUARK_DIR=/builds/install/quark
 export PARSEC_DIR=/builds/install/parsec
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8fdc177ea4aaf0440b8a360c9db352d3c2813f8d..2115996a2052f7eee60d9167382b84a3b8ef291d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,8 +3,7 @@ image: hpclib/hiepacs
 stages:
   - build
   - test
-  - analysis
-  - doc
+  - third
 
 before_script:
   - git submodule update --init --recursive
@@ -235,8 +234,30 @@ test_parsec_master:
   only:
     - master@solverstack/chameleon
 
-sonar:
-  stage: analysis
+coverity:
+  stage: third
+  dependencies: []
+  artifacts:
+    name: chameleon_coverity
+    expire_in: 1 week
+    paths:
+      - chameleon.tgz
+  script:
+    - (cd build &&
+       cmake -C ../cmake_modules/gitlab-ci-initial-cache.cmake .. -DCHAMELEON_USE_CUDA=ON -DCHAMELEON_USE_MPI=ON &&
+       cov-build --dir ../cov-int make -j 4)
+    - tar czvf chameleon.tgz cov-int
+    - curl --form token=$COVERITY_TOKEN
+           --form email=florent.pruvost@inria.fr
+           --form file=@chameleon.tgz
+           --form version="`git rev-parse --short HEAD`"
+           --form description=""
+           https://scan.coverity.com/builds?project=Chameleon
+  only:
+    - master@solverstack/chameleon
+
+sonarqube:
+  stage: third
   dependencies:
     - test_starpu_master
     - test_starpu_simgrid_master
@@ -264,7 +285,7 @@ sonar:
     - master@solverstack/chameleon
 
 doc:
-  stage: doc
+  stage: third
   dependencies: []
   artifacts:
     name: chameleon_doc
diff --git a/README.org b/README.org
index ea5268fb42a81357da40b6c53640029bc4702c96..57a571824b4dec7cfc7373fba05815aafcec5fe7 100644
--- a/README.org
+++ b/README.org
@@ -3,6 +3,12 @@
 #+OPTIONS: H:3 num:t \n:nil @:t ::t |:t _:nil ^:nil -:t f:t *:t <:t
 #+OPTIONS: TeX:t LaTeX:t skip:nil d:nil pri:nil tags:not-in-toc html-style:nil
 
+# gitlab-ci pipeline badge
+#+HTML:<a href="https://gitlab.inria.fr/solverstack/chameleon/commits/master"><img alt="pipeline status"src="https://gitlab.inria.fr/solverstack/chameleon/badges/master/pipeline.svg"/></a>
+
+# Coverity badge
+#+HTML:<a href="https://scan.coverity.com/projects/chameleon"><img alt="Coverity Scan Build Status"src="https://scan.coverity.com/projects/10590/badge.svg"/></a>
+
 Chameleon is a C library providing parallel algorithms to perform
 BLAS/LAPACK operations exploiting fully modern architectures.