diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 79ef2c3a1e..c23a6a1e46 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -96,9 +96,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        sq_version:
-          - LATEST_RELEASE
-          - DEV
+        item:
+          - sq_version: LATEST_RELEASE
+            java_version: 21
+          - sq_version: LATEST_RELEASE
+            java_version: 17
+          - sq_version: DEV
+            java_version: 21
     name: Plugin QA
     needs:
       - build
@@ -116,8 +120,8 @@ jobs:
       - uses: jdx/mise-action@5ac50f778e26fac95da98d50503682459e86d566 # v3.2.0
         with:
           version: 2025.7.12
-      - name: Select Java 17
-        run: mise use java@17
+      - name: Select Java Version
+        run: mise use java@${{ matrix.item.java_version}}
       - name: Configure Maven
         uses: SonarSource/ci-github-actions/config-maven@v1
         with:
@@ -133,7 +137,7 @@ jobs:
           GITHUB_TOKEN: ${{ fromJSON(steps.secrets.outputs.vault).GITHUB_TOKEN }}
         run: |
           cd its/plugin
-          mvn package --batch-mode -Pit-plugin -Dsonar.runtimeVersion=${{ matrix.sq_version }} -Dmaven.test.redirectTestOutputToFile=false -B -e -V -Dparallel=classes -DuseUnlimitedThreads=true
+          mvn package --batch-mode -Pit-plugin -Dsonar.runtimeVersion=${{ matrix.item.sq_version }} -Dmaven.test.redirectTestOutputToFile=false -B -e -V -Dparallel=classes -DuseUnlimitedThreads=true
 
   sanity:
     name: Sanity Test
diff --git a/its/plugin/projects/spotbugs-external-report/pom.xml b/its/plugin/projects/spotbugs-external-report/pom.xml
index 901a6ec4f9..f4aa34f1cb 100644
--- a/its/plugin/projects/spotbugs-external-report/pom.xml
+++ b/its/plugin/projects/spotbugs-external-report/pom.xml
@@ -14,7 +14,7 @@
       <plugin>
         <groupId>com.github.spotbugs</groupId>
         <artifactId>spotbugs-maven-plugin</artifactId>
-        <version>4.5.3.0</version>
+        <version>4.9.8.2</version>
         <configuration>
           <plugins>
             <plugin>
diff --git a/its/plugin/tests/src/test/java/com/sonar/it/java/suite/ExternalReportTest.java b/its/plugin/tests/src/test/java/com/sonar/it/java/suite/ExternalReportTest.java
index eeb0a2b182..e66c75aa96 100644
--- a/its/plugin/tests/src/test/java/com/sonar/it/java/suite/ExternalReportTest.java
+++ b/its/plugin/tests/src/test/java/com/sonar/it/java/suite/ExternalReportTest.java
@@ -74,7 +74,7 @@ public void pmd() {
   public void spotbugs() {
     MavenBuild build = TestUtils.createMavenBuild().setPom(TestUtils.projectPom("spotbugs-external-report"))
       .setProperty("sonar.java.spotbugs.reportPaths", "target" + File.separator + "spotbugsXml.xml")
-      .setGoals("clean package com.github.spotbugs:spotbugs-maven-plugin:4.5.3.0:spotbugs", "sonar:sonar");
+      .setGoals("clean package com.github.spotbugs:spotbugs-maven-plugin:spotbugs", "sonar:sonar");
     orchestrator.executeBuild(build);
 
     String projectKey = "org.sonarsource.it.projects:spotbugs-external-report";
diff --git a/mise.toml b/mise.toml
index c9152e9e51..4b3e4cec4c 100644
--- a/mise.toml
+++ b/mise.toml
@@ -1,3 +1,3 @@
 [tools]
-java = ["24", "17"]
+java = ["24", "21", "17"]
 maven = "3.9"