diff --git a/dockerfiles/sonar-scanner-cli/Dockerfile b/dockerfiles/sonar-scanner-cli/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..a00255f38508e75a06cb116ce69df444d029bae4
--- /dev/null
+++ b/dockerfiles/sonar-scanner-cli/Dockerfile
@@ -0,0 +1,8 @@
+FROM sonarsource/sonar-scanner-cli:4.7
+
+LABEL description="SonarScanner + other utils"
+
+RUN apk add --no-cache curl jq \
+    # We need at least pylint 2.13.5 to fix https://github.com/PyCQA/pylint/issues/6089
+    && pip install pylint --upgrade \
+    && pip install coverage-fixpaths pylint-sonarjson
diff --git a/dockerfiles/sonar-scanner-cli/README.rst b/dockerfiles/sonar-scanner-cli/README.rst
new file mode 100644
index 0000000000000000000000000000000000000000..900b3bfefb3190f2e094f598ab5402f0b2e328e9
--- /dev/null
+++ b/dockerfiles/sonar-scanner-cli/README.rst
@@ -0,0 +1,5 @@
+=================
+sonar-scanner-cli
+=================
+
+Docker image for SonarScanner + handy utilities to call the SonarQube API.
diff --git a/templates/sonarqube.yml b/templates/sonarqube.yml
index 28b8f49cbcfb9dc82c02cb3950b969531c0e9dd8..d3877f5d6076c78ce3bc5e55afa0eae2ab3d3bfb 100644
--- a/templates/sonarqube.yml
+++ b/templates/sonarqube.yml
@@ -1,9 +1,9 @@
 include:
-  - local: '/templates/shared/stages.yml'
+  - local: '/templates/shared/all.yml'
 
 .abstract_sonar:
   image:
-    name: omegacen/sonar-scanner-cli
+    name: ${CI_AWE_IMAGE_BASE}/sonar-scanner-cli:${CI_AWE_IMAGE_TAG}
     entrypoint: [""]
   stage: quality
   variables: