diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index fe3ffd94..3a17a025 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -5,7 +5,7 @@ name: Java CI with Gradle
 
 on:
   push:
-    branches: [ master ]
+    branches: [ '*' ]
   pull_request:
     branches: [ master ]
 
@@ -23,7 +23,7 @@ jobs:
       uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
-        java-version: '21.0.1'
+        java-version: '21.0.2'
         
     - name: Build with Gradle
       run: ./gradlew build -xtest
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5201b45b..2d5eeb73 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -24,7 +24,7 @@ jobs:
       uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
-        java-version: '21.0.1'
+        java-version: '21.0.2'
         
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
@@ -147,7 +147,7 @@ jobs:
       uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
-        java-version: '21.0.1'
+        java-version: '21.0.2'
         
     - name: JPackage MSI with Gradle
       run: ./gradlew build jpackage -PtargetPlatform=win -PinstallerType=msi
@@ -193,7 +193,7 @@ jobs:
       uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
-        java-version: '21.0.1'
+        java-version: '21.0.2'
         
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
diff --git a/.github/workflows/sonarqube.yml b/.github/workflows/sonarqube.yml
index bacfbb31..9245bceb 100644
--- a/.github/workflows/sonarqube.yml
+++ b/.github/workflows/sonarqube.yml
@@ -2,7 +2,7 @@ name: SonarCloud
 on:
   push:
     branches:
-      - master
+      - '*'
   pull_request:
     types: [opened, synchronize, reopened]
 jobs:
@@ -35,5 +35,5 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: ./gradlew build codeCoverageReport jacocoTestReport sonarqube --stacktrace
+        run: ./gradlew build codeCoverageReport jacocoTestReport sonar --stacktrace
         
diff --git a/settings.gradle b/settings.gradle
index 1cb2e4dd..fb2f45e7 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,6 +1,6 @@
 pluginManagement {
 	plugins {
-		id "org.sonarqube" version "4.+"
+		id "org.sonarqube" version "latest.release"
 	}
 }
 rootProject.name = 'JRomManager'