diff --git a/charts/pipelines-library/templates/pipelines/autotests/gradle/bitbucket-build-default.yaml b/charts/pipelines-library/templates/pipelines/autotests/gradle/bitbucket-build-default.yaml
index d6500819..4863cfec 100644
--- a/charts/pipelines-library/templates/pipelines/autotests/gradle/bitbucket-build-default.yaml
+++ b/charts/pipelines-library/templates/pipelines/autotests/gradle/bitbucket-build-default.yaml
@@ -1,7 +1,7 @@
 {{ if has "bitbucket" .Values.global.gitProviders }}
 {{ if or ( .Values.pipelines.deployableResources.java.java8 ) ( .Values.pipelines.deployableResources.java.java11 ) ( .Values.pipelines.deployableResources.java.java17 )}}
 {{- $raw := include "edp-tekton.resourceMapping.maven" . | fromYaml -}}
-{{- $rawSonar := include "edp-tekton.resourceMapping.mavenSonar" . | fromYaml -}}
+{{- $rawSonar := include "edp-tekton.resourceMapping.gradleSonar" . | fromYaml -}}
 {{- range $framework, $image := $raw }}
 {{- $sonarImage := pluck $framework $rawSonar | first -}}
 apiVersion: tekton.dev/v1
diff --git a/charts/pipelines-library/templates/pipelines/autotests/gradle/bitbucket-build-edp.yaml b/charts/pipelines-library/templates/pipelines/autotests/gradle/bitbucket-build-edp.yaml
index 33ed8882..2db2f5a8 100644
--- a/charts/pipelines-library/templates/pipelines/autotests/gradle/bitbucket-build-edp.yaml
+++ b/charts/pipelines-library/templates/pipelines/autotests/gradle/bitbucket-build-edp.yaml
@@ -1,7 +1,7 @@
 {{ if has "bitbucket" .Values.global.gitProviders }}
 {{ if or ( .Values.pipelines.deployableResources.java.java8 ) ( .Values.pipelines.deployableResources.java.java11 ) ( .Values.pipelines.deployableResources.java.java17 )}}
 {{- $raw := include "edp-tekton.resourceMapping.maven" . | fromYaml -}}
-{{- $rawSonar := include "edp-tekton.resourceMapping.mavenSonar" . | fromYaml -}}
+{{- $rawSonar := include "edp-tekton.resourceMapping.gradleSonar" . | fromYaml -}}
 {{- range $framework, $image := $raw }}
 {{- $sonarImage := pluck $framework $rawSonar | first -}}
 apiVersion: tekton.dev/v1
diff --git a/charts/pipelines-library/templates/pipelines/autotests/gradle/bitbucket-review.yaml b/charts/pipelines-library/templates/pipelines/autotests/gradle/bitbucket-review.yaml
index a3621bde..d832e008 100644
--- a/charts/pipelines-library/templates/pipelines/autotests/gradle/bitbucket-review.yaml
+++ b/charts/pipelines-library/templates/pipelines/autotests/gradle/bitbucket-review.yaml
@@ -1,7 +1,7 @@
 {{ if has "bitbucket" .Values.global.gitProviders }}
 {{ if or ( .Values.pipelines.deployableResources.java.java8 ) ( .Values.pipelines.deployableResources.java.java11 ) ( .Values.pipelines.deployableResources.java.java17 )}}
 {{- $raw := include "edp-tekton.resourceMapping.maven" . | fromYaml -}}
-{{- $rawSonar := include "edp-tekton.resourceMapping.mavenSonar" . | fromYaml -}}
+{{- $rawSonar := include "edp-tekton.resourceMapping.gradleSonar" . | fromYaml -}}
 {{- range $framework, $image := $raw }}
 {{- $sonarImage := pluck $framework $rawSonar | first -}}
 apiVersion: tekton.dev/v1
diff --git a/charts/pipelines-library/templates/pipelines/autotests/gradle/gerrit-build-default.yaml b/charts/pipelines-library/templates/pipelines/autotests/gradle/gerrit-build-default.yaml
index 95b3d19b..e6a272f7 100644
--- a/charts/pipelines-library/templates/pipelines/autotests/gradle/gerrit-build-default.yaml
+++ b/charts/pipelines-library/templates/pipelines/autotests/gradle/gerrit-build-default.yaml
@@ -1,7 +1,7 @@
 {{ if has "gerrit" .Values.global.gitProviders }}
 {{ if or ( .Values.pipelines.deployableResources.java.java8 ) ( .Values.pipelines.deployableResources.java.java11 ) ( .Values.pipelines.deployableResources.java.java17 )}}
 {{- $raw := include "edp-tekton.resourceMapping.maven" . | fromYaml -}}
-{{- $rawSonar := include "edp-tekton.resourceMapping.mavenSonar" . | fromYaml -}}
+{{- $rawSonar := include "edp-tekton.resourceMapping.gradleSonar" . | fromYaml -}}
 {{- range $framework, $image := $raw }}
 {{- $sonarImage := pluck $framework $rawSonar | first -}}
 apiVersion: tekton.dev/v1
diff --git a/charts/pipelines-library/templates/pipelines/autotests/gradle/gerrit-build-edp.yaml b/charts/pipelines-library/templates/pipelines/autotests/gradle/gerrit-build-edp.yaml
index 0f472bf3..cb559a0c 100644
--- a/charts/pipelines-library/templates/pipelines/autotests/gradle/gerrit-build-edp.yaml
+++ b/charts/pipelines-library/templates/pipelines/autotests/gradle/gerrit-build-edp.yaml
@@ -1,7 +1,7 @@
 {{ if has "gerrit" .Values.global.gitProviders }}
 {{ if or ( .Values.pipelines.deployableResources.java.java8 ) ( .Values.pipelines.deployableResources.java.java11 ) ( .Values.pipelines.deployableResources.java.java17 )}}
 {{- $raw := include "edp-tekton.resourceMapping.maven" . | fromYaml -}}
-{{- $rawSonar := include "edp-tekton.resourceMapping.mavenSonar" . | fromYaml -}}
+{{- $rawSonar := include "edp-tekton.resourceMapping.gradleSonar" . | fromYaml -}}
 {{- range $framework, $image := $raw }}
 {{- $sonarImage := pluck $framework $rawSonar | first -}}
 apiVersion: tekton.dev/v1
diff --git a/charts/pipelines-library/templates/pipelines/autotests/gradle/gerrit-review.yaml b/charts/pipelines-library/templates/pipelines/autotests/gradle/gerrit-review.yaml
index 52a9c0c0..28c45dab 100644
--- a/charts/pipelines-library/templates/pipelines/autotests/gradle/gerrit-review.yaml
+++ b/charts/pipelines-library/templates/pipelines/autotests/gradle/gerrit-review.yaml
@@ -1,7 +1,7 @@
 {{ if has "gerrit" .Values.global.gitProviders }}
 {{ if or ( .Values.pipelines.deployableResources.java.java8 ) ( .Values.pipelines.deployableResources.java.java11 ) ( .Values.pipelines.deployableResources.java.java17 )}}
 {{- $raw := include "edp-tekton.resourceMapping.maven" . | fromYaml -}}
-{{- $rawSonar := include "edp-tekton.resourceMapping.mavenSonar" . | fromYaml -}}
+{{- $rawSonar := include "edp-tekton.resourceMapping.gradleSonar" . | fromYaml -}}
 {{- range $framework, $image := $raw }}
 {{- $sonarImage := pluck $framework $rawSonar | first -}}
 apiVersion: tekton.dev/v1
diff --git a/charts/pipelines-library/templates/pipelines/autotests/gradle/github-build-default.yaml b/charts/pipelines-library/templates/pipelines/autotests/gradle/github-build-default.yaml
index c9f328cd..fd11d4d7 100644
--- a/charts/pipelines-library/templates/pipelines/autotests/gradle/github-build-default.yaml
+++ b/charts/pipelines-library/templates/pipelines/autotests/gradle/github-build-default.yaml
@@ -1,7 +1,7 @@
 {{ if has "github" .Values.global.gitProviders }}
 {{ if or ( .Values.pipelines.deployableResources.java.java8 ) ( .Values.pipelines.deployableResources.java.java11 ) ( .Values.pipelines.deployableResources.java.java17 )}}
 {{- $raw := include "edp-tekton.resourceMapping.maven" . | fromYaml -}}
-{{- $rawSonar := include "edp-tekton.resourceMapping.mavenSonar" . | fromYaml -}}
+{{- $rawSonar := include "edp-tekton.resourceMapping.gradleSonar" . | fromYaml -}}
 {{- range $framework, $image := $raw }}
 {{- $sonarImage := pluck $framework $rawSonar | first -}}
 apiVersion: tekton.dev/v1
diff --git a/charts/pipelines-library/templates/pipelines/autotests/gradle/github-build-edp.yaml b/charts/pipelines-library/templates/pipelines/autotests/gradle/github-build-edp.yaml
index 7341cb87..3d11a80d 100644
--- a/charts/pipelines-library/templates/pipelines/autotests/gradle/github-build-edp.yaml
+++ b/charts/pipelines-library/templates/pipelines/autotests/gradle/github-build-edp.yaml
@@ -1,7 +1,7 @@
 {{ if has "github" .Values.global.gitProviders }}
 {{ if or ( .Values.pipelines.deployableResources.java.java8 ) ( .Values.pipelines.deployableResources.java.java11 ) ( .Values.pipelines.deployableResources.java.java17 )}}
 {{- $raw := include "edp-tekton.resourceMapping.maven" . | fromYaml -}}
-{{- $rawSonar := include "edp-tekton.resourceMapping.mavenSonar" . | fromYaml -}}
+{{- $rawSonar := include "edp-tekton.resourceMapping.gradleSonar" . | fromYaml -}}
 {{- range $framework, $image := $raw }}
 {{- $sonarImage := pluck $framework $rawSonar | first -}}
 apiVersion: tekton.dev/v1
diff --git a/charts/pipelines-library/templates/pipelines/autotests/gradle/github-review.yaml b/charts/pipelines-library/templates/pipelines/autotests/gradle/github-review.yaml
index 40407a8a..33f3e152 100644
--- a/charts/pipelines-library/templates/pipelines/autotests/gradle/github-review.yaml
+++ b/charts/pipelines-library/templates/pipelines/autotests/gradle/github-review.yaml
@@ -1,7 +1,7 @@
 {{ if has "github" .Values.global.gitProviders }}
 {{ if or ( .Values.pipelines.deployableResources.java.java8 ) ( .Values.pipelines.deployableResources.java.java11 ) ( .Values.pipelines.deployableResources.java.java17 )}}
 {{- $raw := include "edp-tekton.resourceMapping.maven" . | fromYaml -}}
-{{- $rawSonar := include "edp-tekton.resourceMapping.mavenSonar" . | fromYaml -}}
+{{- $rawSonar := include "edp-tekton.resourceMapping.gradleSonar" . | fromYaml -}}
 {{- range $framework, $image := $raw }}
 {{- $sonarImage := pluck $framework $rawSonar | first -}}
 apiVersion: tekton.dev/v1
diff --git a/charts/pipelines-library/templates/pipelines/autotests/gradle/gitlab-build-default.yaml b/charts/pipelines-library/templates/pipelines/autotests/gradle/gitlab-build-default.yaml
index 55ceeeb6..5c966d35 100644
--- a/charts/pipelines-library/templates/pipelines/autotests/gradle/gitlab-build-default.yaml
+++ b/charts/pipelines-library/templates/pipelines/autotests/gradle/gitlab-build-default.yaml
@@ -1,7 +1,7 @@
 {{ if has "gitlab" .Values.global.gitProviders }}
 {{ if or ( .Values.pipelines.deployableResources.java.java8 ) ( .Values.pipelines.deployableResources.java.java11 ) ( .Values.pipelines.deployableResources.java.java17 )}}
 {{- $raw := include "edp-tekton.resourceMapping.maven" . | fromYaml -}}
-{{- $rawSonar := include "edp-tekton.resourceMapping.mavenSonar" . | fromYaml -}}
+{{- $rawSonar := include "edp-tekton.resourceMapping.gradleSonar" . | fromYaml -}}
 {{- range $framework, $image := $raw }}
 {{- $sonarImage := pluck $framework $rawSonar | first -}}
 apiVersion: tekton.dev/v1
diff --git a/charts/pipelines-library/templates/pipelines/autotests/gradle/gitlab-build-edp.yaml b/charts/pipelines-library/templates/pipelines/autotests/gradle/gitlab-build-edp.yaml
index 3bcff39f..dd4cba02 100644
--- a/charts/pipelines-library/templates/pipelines/autotests/gradle/gitlab-build-edp.yaml
+++ b/charts/pipelines-library/templates/pipelines/autotests/gradle/gitlab-build-edp.yaml
@@ -1,7 +1,7 @@
 {{ if has "gitlab" .Values.global.gitProviders }}
 {{ if or ( .Values.pipelines.deployableResources.java.java8 ) ( .Values.pipelines.deployableResources.java.java11 ) ( .Values.pipelines.deployableResources.java.java17 )}}
 {{- $raw := include "edp-tekton.resourceMapping.maven" . | fromYaml -}}
-{{- $rawSonar := include "edp-tekton.resourceMapping.mavenSonar" . | fromYaml -}}
+{{- $rawSonar := include "edp-tekton.resourceMapping.gradleSonar" . | fromYaml -}}
 {{- range $framework, $image := $raw }}
 {{- $sonarImage := pluck $framework $rawSonar | first -}}
 apiVersion: tekton.dev/v1
diff --git a/charts/pipelines-library/templates/pipelines/autotests/gradle/gitlab-review.yaml b/charts/pipelines-library/templates/pipelines/autotests/gradle/gitlab-review.yaml
index 93a354b6..86f18503 100644
--- a/charts/pipelines-library/templates/pipelines/autotests/gradle/gitlab-review.yaml
+++ b/charts/pipelines-library/templates/pipelines/autotests/gradle/gitlab-review.yaml
@@ -1,7 +1,7 @@
 {{ if has "gitlab" .Values.global.gitProviders }}
 {{ if or ( .Values.pipelines.deployableResources.java.java8 ) ( .Values.pipelines.deployableResources.java.java11 ) ( .Values.pipelines.deployableResources.java.java17 )}}
 {{- $raw := include "edp-tekton.resourceMapping.maven" . | fromYaml -}}
-{{- $rawSonar := include "edp-tekton.resourceMapping.mavenSonar" . | fromYaml -}}
+{{- $rawSonar := include "edp-tekton.resourceMapping.gradleSonar" . | fromYaml -}}
 {{- range $framework, $image := $raw }}
 {{- $sonarImage := pluck $framework $rawSonar | first -}}
 apiVersion: tekton.dev/v1