diff --git a/.github/workflows/gradle-build.yml b/.github/workflows/gradle-build.yml
index b7f188d0..cb0dea71 100644
--- a/.github/workflows/gradle-build.yml
+++ b/.github/workflows/gradle-build.yml
@@ -103,33 +103,3 @@ jobs:
           build-scan-publish: true
           build-scan-terms-of-use-url: "https://gradle.com/terms-of-service"
           build-scan-terms-of-use-agree: "yes"
-
-  code-quality:
-    name: Code Quality with Sonar
-    needs: [gradle-build, check-changes]
-    if: ${{ needs.check-changes.outputs.source-changes == 'true' || needs.check-changes.outputs.gradle-root-changes == 'true' }}
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v7
-        with:
-          fetch-depth: 0      
-      - name: Set up JDK
-        uses: actions/setup-java@v6
-        with:
-          java-version: '25'
-          distribution: 'temurin'
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v6.3.0
-        with:
-          add-job-summary-as-pr-comment: on-failure
-          build-scan-publish: true
-          build-scan-terms-of-use-url: "https://gradle.com/terms-of-service"
-          build-scan-terms-of-use-agree: "yes"
-      - name: Download build artifacts
-        uses: actions/download-artifact@v8
-        with:
-          artifact-ids: ${{ needs.gradle-build.outputs.build-artifacts }}
-      - name: Publish Sonar report
-        env:
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: ./gradlew sonar
diff --git a/README.adoc b/README.adoc
index 531c3679..7d9b51ad 100644
--- a/README.adoc
+++ b/README.adoc
@@ -13,9 +13,6 @@ with source code in individual submodules and can be found on {url-quickref}[Git
 image:https://img.shields.io/badge/Java_-25-blue?style=flat-square[Static Badge]
 image:https://img.shields.io/badge/Spring_Boot-4.1.1-blue?style=flat-square&logo=springboot[Spring Boot version]
 image:https://img.shields.io/github/actions/workflow/status/rashidi/spring-boot-tutorials/gradle-build.yml?style=flat-square&logo=githubactions&color=blue[Gradle Build]
-image:https://img.shields.io/sonar/coverage/rashidi_spring-boot-tutorials?server=https%3A%2F%2Fsonarcloud.io&style=flat-square&color=blue[Sonar Coverage]
-image:https://img.shields.io/sonar/tech_debt/rashidi_spring-boot-tutorials?server=https%3A%2F%2Fsonarcloud.io&style=flat-square&color=blue[Sonar Tech Debt]
-image:https://img.shields.io/sonar/quality_gate/rashidi_spring-boot-tutorials?server=https%3A%2F%2Fsonarcloud.io&style=flat-square&color=blue[Sonar Quality Gate]
 image:https://img.shields.io/github/license/rashidi/spring-boot-tutorials?style=flat-square&color=blue[License - Unlicense]
 
 == Motivation
diff --git a/build.gradle.kts b/build.gradle.kts
index 4952f04a..38469267 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -4,7 +4,6 @@ plugins {
     java
     id("org.springframework.boot") version "4.1.1" apply false
     id("io.spring.dependency-management") version "1.1.7"
-    id("org.sonarqube") version "7.4.0.8496"
     id("jacoco-report-aggregation")
 }
 
@@ -29,16 +28,6 @@ dependencies {
     }
 }
 
-sonar {
-    properties {
-        property("sonar.projectKey", "rashidi_spring-boot-tutorials")
-        property("sonar.organization", "rashidi-github")
-        property("sonar.host.url", "https://sonarcloud.io")
-        property("sonar.java.binaries", "**/build/classes")
-        property("sonar.coverage.jacoco.xmlReportPaths", "${layout.buildDirectory.get()}/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml")
-    }
-}
-
 subprojects {
     apply(plugin = "jacoco")