diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index af7816d28a1febed202096f9f8ce994009c890a6..813b4e40b87c8474fecd1538b7955b7f0fd96e8c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,38 +18,37 @@ variables:
   GIT_DEPTH: 0
 
 stages:
-  - sonar-analysis
-  - build
-
-sonarqube:
-  stage: sonar-analysis
-  image: skilldlabs/sonar-scanner:3.4.0
-  script:
-    - >
-      sonar-scanner
-      -Dsonar.projectName=${CI_PROJECT_NAME}
-      -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-and-test-with-sonar-concurrently
 
 build-master:
-  stage: build
+  stage: build-and-test-with-sonar-concurrently
   script:
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
-    - DOCKER_BUILDKIT=1 docker build --build-arg BUILDKIT_INLINE_CACHE=1 --pull -t "$CI_REGISTRY_IMAGE" .
+    - DOCKER_BUILDKIT=1 docker build --pull -t "$CI_REGISTRY_IMAGE" .
     - docker push "$CI_REGISTRY_IMAGE"
   only:
     - master
 
 build:
-  stage: build
+  stage: build-and-test-with-sonar-concurrently
   script:
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
-    - DOCKER_BUILDKIT=1 docker build --build-arg BUILDKIT_INLINE_CACHE=1 --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
+    - DOCKER_BUILDKIT=1 docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
     - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
   except:
     - master
 
+sonarqube:
+  stage: build-and-test-with-sonar-concurrently
+  image: registry.forge.grandlyon.com/apoyen/sonnar-scanner-gl:master
+  script:
+    - >
+      sonar-scanner
+      -Dsonar.projectName=${CI_PROJECT_NAME}
+      -Dsonar.projectVersion=1.0
+      -Dsonar.sourceEncoding=UTF-8
+      -Dsonar.projectBaseDir=.
+      -Dsonar.host.url=${SONAR_URL}
+      -Dsonar.projectKey=${SONAR_PROJECT_KEY}
+      -Dsonar.login=${SONAR_TOKEN}
+      -Dsonar.exclusions=**/*_test.go