diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fd19a95..ddb639b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -5,7 +5,7 @@ on:
     branches:
       - master
   pull_request:
-      types: [opened, synchronize, reopened]
+    types: [opened, synchronize, reopened]
   workflow_dispatch:
 
 jobs:
@@ -13,33 +13,41 @@ jobs:
     name: Build, Test & Scan
     runs-on: ubuntu-latest
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
-    steps:        
+    steps:
       - name: Git checkout
         uses: actions/checkout@v3
-        
+        with:
+          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
           java-version: '18'
           distribution: 'temurin'
-          cache: 'maven'
-          
+
+      - name: Cache SonarCloud packages
+        uses: actions/cache@v3
+        with:
+          path: ~/.sonar/cache
+          key: ${{ runner.os }}-sonar
+          restore-keys: ${{ runner.os }}-sonar
+
+      - name: Cache Maven packages
+        uses: actions/cache@v3
+        with:
+          path: ~/.m2
+          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ${{ runner.os }}-m2
+
       - name: Extract Maven project version
         id: project
         run: echo "GAMEYFIN_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_OUTPUT
 
-      - name: Show extracted Maven project version
-        run: echo "${{ steps.project.outputs.GAMEYFIN_VERSION }}"
-        
-      - name: Maven build
-        run: mvn --batch-mode --update-snapshots package
-        
-      - name: SonarQube scan
-        uses: kitabisa/sonarqube-action@v1.2.0
-        with:
-          host: https://sonarqube.grimsi.de
-          login: ${{ secrets.SONARQUBE_TOKEN }}
-          projectKey: grimsi_gameyfin_AYPM67pzsxiaNzCh9BZd
+      - name: Build and analyze
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
 
       - name: Upload build artifact
         uses: actions/upload-artifact@v3
diff --git a/pom.xml b/pom.xml
index 4911d82..c2c5cf9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,9 +26,13 @@
         <connection>scm:git:https://github.com/grimsi/gameyfin.git</connection>
         <url>scm:git:https://github.com/grimsi/gameyfin.git</url>
         <developerConnection>scm:git:https://github.com/grimsi/gameyfin.git</developerConnection>
-        <tag>v1.2.2</tag>
     </scm>
 
+    <properties>
+        <sonar.organization>grimsi-github</sonar.organization>
+        <sonar.host.url>https://sonarcloud.io</sonar.host.url>
+    </properties>
+
     <build>
         <plugins>
             <plugin>
diff --git a/sonar-project.properties b/sonar-project.properties
index cb0b4b5..3593a3c 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -1,4 +1,4 @@
-sonar.projectKey=grimsi_gameyfin_AYPM67pzsxiaNzCh9BZd
+sonar.projectKey=grimsi_gameyfin
 
 # Point SONAR to the compiled Java classes
 sonar.java.binaries=./backend/target