diff --git a/.github/workflows/java-gradle-base.yaml b/.github/workflows/java-gradle-base.yaml
index c86a310aa..3339b508f 100644
--- a/.github/workflows/java-gradle-base.yaml
+++ b/.github/workflows/java-gradle-base.yaml
@@ -104,7 +104,7 @@ jobs:
     needs: test
     steps:
       - name: Assess code quality
-        uses: bakdata/ci-templates/actions/java-gradle-assess-code-quality@1.61.0
+        uses: bakdata/ci-templates/actions/java-gradle-assess-code-quality@1.62.0
         with:
           download-lfs-files: ${{ inputs.download-lfs-files }}
           gradle-cache: ${{ inputs.gradle-cache }}
diff --git a/.github/workflows/java-gradle-docker.yaml b/.github/workflows/java-gradle-docker.yaml
index a2e85c20d..4d316ce5b 100644
--- a/.github/workflows/java-gradle-docker.yaml
+++ b/.github/workflows/java-gradle-docker.yaml
@@ -93,7 +93,7 @@ concurrency:
 jobs:
   build-and-test:
     name: Build, Test and Assess code quality
-    uses: bakdata/ci-templates/.github/workflows/java-gradle-base.yaml@1.61.0
+    uses: bakdata/ci-templates/.github/workflows/java-gradle-base.yaml@1.62.0
     with:
       java-distribution: ${{ inputs.java-distribution }}
       java-version: ${{ inputs.java-version }}
diff --git a/.github/workflows/java-gradle-library.yaml b/.github/workflows/java-gradle-library.yaml
index 7f2ac22c4..4b2d2198c 100644
--- a/.github/workflows/java-gradle-library.yaml
+++ b/.github/workflows/java-gradle-library.yaml
@@ -73,7 +73,7 @@ concurrency:
 jobs:
   build-and-test:
     name: Build, Test and Assess code quality
-    uses: bakdata/ci-templates/.github/workflows/java-gradle-base.yaml@1.61.0
+    uses: bakdata/ci-templates/.github/workflows/java-gradle-base.yaml@1.62.0
     with:
       java-distribution: ${{ inputs.java-distribution }}
       java-version: ${{ inputs.java-version }}
diff --git a/.github/workflows/java-gradle-plugin.yaml b/.github/workflows/java-gradle-plugin.yaml
index feca99317..de2a7a9fd 100644
--- a/.github/workflows/java-gradle-plugin.yaml
+++ b/.github/workflows/java-gradle-plugin.yaml
@@ -79,7 +79,7 @@ concurrency:
 jobs:
   build-and-test:
     name: Build, Test and Assess code quality
-    uses: bakdata/ci-templates/.github/workflows/java-gradle-base.yaml@1.61.0
+    uses: bakdata/ci-templates/.github/workflows/java-gradle-base.yaml@1.62.0
     with:
       java-distribution: ${{ inputs.java-distribution }}
       java-version: ${{ inputs.java-version }}
diff --git a/actions/java-gradle-assess-code-quality/action.yaml b/actions/java-gradle-assess-code-quality/action.yaml
index 06463c077..38de7c845 100644
--- a/actions/java-gradle-assess-code-quality/action.yaml
+++ b/actions/java-gradle-assess-code-quality/action.yaml
@@ -81,11 +81,15 @@ runs:
     - name: Assess code quality
       if: ${{ inputs.sonar-token != '' }}
       run: |
-        ./gradlew -Dsonar.branch.autoconfig.disabled=true \
+        ./gradlew \
           -Dsonar.host.url=${{ inputs.sonar-host }} \
           ${{ (inputs.sonar-organization != '' && format('-Dsonar.organization={0}', inputs.sonar-organization)) || '' }} \
           ${{ (inputs.sonar-project-key != '' && format('-Dsonar.projectKey={0}', inputs.sonar-project-key)) || '' }} \
           ${{ (inputs.sonar-project-name != '' && format('-Dsonar.projectName={0}', inputs.sonar-project-name)) || '' }} \
+          ${{ (github.event_name == 'push' && github.ref_type != 'tag' && format('-Dsonar.branch.name={0}', github.ref_name)) || '' }} \
+          ${{ (github.event_name == 'pull_request' && format('-Dsonar.pullrequest.key={0}', github.event.pull_request.number)) || '' }} \
+          ${{ (github.event_name == 'pull_request' && format('-Dsonar.pullrequest.branch={0}', github.head_ref)) || '' }} \
+          ${{ (github.event_name == 'pull_request' && format('-Dsonar.pullrequest.base={0}', github.base_ref)) || '' }} \
           --info --stacktrace sonar \
           ${{ inputs.gradle-refresh-dependencies == 'true' && '--refresh-dependencies' || '' }}
       shell: bash