diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml
deleted file mode 100644
index e20413e..0000000
--- a/.github/workflows/sonar.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-name: Sonar
-on:
-  workflow_run:
-    workflows: [ Build ]
-    types:
-      - completed
-
-env:
-  JAVA_VERSION: '17.0.8+7'
-  JAVA_DISTRIBUTION: 'temurin'
-
-jobs:
-  sonar:
-    name: 'Sonar analysis'
-    runs-on: ubuntu-latest
-    if: ${{ github.event.workflow_run.conclusion == 'success' }}
-    permissions:
-      actions: read # Required to download artifacts
-    steps:
-      - name: 'Sonar analysis'
-        uses: evaristegalois11/sonar-fork-analysis@v1
-        with:
-          distribution: ${{ env.JAVA_DISTRIBUTION }}
-          java-version: ${{ env.JAVA_VERSION }}
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          sonar-token: ${{ secrets.SONAR_TOKEN }}
-          project-key: "mfl28_BoundingBoxEditor"
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index 57baba8..18affaa 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -102,8 +102,6 @@ jobs:
         run: ./gradlew --info --stacktrace build -x test
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v2
-      - name: 'Prepare Sonar analysis'
-        uses: evaristegalois11/sonar-fork-analysis@v1
       - name: Test setup
         run: |
           sudo apt-get install xvfb fluxbox
diff --git a/build.gradle b/build.gradle
index 4085421..4dd647c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -258,7 +258,7 @@ task dist {
     dependsOn clean, jlinkZip
 }
 
-sonarqube {
+sonar {
     properties {
         property "sonar.projectKey", "mfl28_BoundingBoxEditor"
         property "sonar.organization", "mfl28"