diff --git a/.gitlab/coverage.yml b/.gitlab/coverage.yml
index 5bbd7aff4262c921ccc8c293e5d71ce78af9f505..42cbf2a86a6bf12643fdeba66ba619577ae4d771 100644
--- a/.gitlab/coverage.yml
+++ b/.gitlab/coverage.yml
@@ -8,6 +8,7 @@
 coverage:
   image: registry.gitlab.inria.fr/solverstack/docker/distrib
   stage: analyse
+  tags: ["docker"]
   script:
     - tools/coverage.sh
   only:
diff --git a/.gitlab/sonarqube.yml b/.gitlab/sonarqube.yml
index 564e62d6f6e659c628b379875c5a046f27dd6e00..b4d5f8fd7fde9ac81f61494cbfff313062b6a8c8 100644
--- a/.gitlab/sonarqube.yml
+++ b/.gitlab/sonarqube.yml
@@ -1,7 +1,7 @@
+---
 sonarqube:
-  image: registry.gitlab.inria.fr/solverstack/docker/distrib
   stage: analyse
-  tags: ["linux"]
+  tags: ["docker","linux"]
   artifacts:
     name: chameleon_analysis
     expire_in: 1 week
@@ -15,8 +15,5 @@ sonarqube:
   script:
     - cat *.log > chameleon_build.log
     - ./tools/analysis.sh
-  only:
-    - master@solverstack/chameleon
-    - /^ci-.*$/
-  except:
-    - schedules
+  extends:
+    - .only-master