diff --git a/docker-compose.yaml b/docker-compose.yaml
index c8401383..6c4ce7f3 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -78,12 +78,10 @@ services:
     command: bash -c "./scripts/run-cmake.sh && make -Cbuild -j8 npmpkg"
 
   sonar-scan:
-    extends: all
+    extends: base
+    image: inteliotdevkit/upm-sonar
     environment:
-      - BUILDSWIGPYTHON=ON
-      - BUILDSWIGNODE=ON
-      - BUILDSWIGJAVA=ON
-      - BUILDEXAMPLES=ON
+      - BUILDTESTS=OFF
       - SONAR_TOKEN
       - SONAR_ORG
       - SONAR_PROJ_KEY