diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle
index 93a89a92192..6164742037c 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle
+++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle
@@ -154,7 +154,3 @@ plugins.withType(EclipsePlugin) {
 		}
 	}
 }
-
-toolchain {
-	maximumCompatibleJavaVersion = JavaLanguageVersion.of(23)
-}
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleVersions.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleVersions.java
index 38f9844ec75..6d894460e73 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleVersions.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleVersions.java
@@ -33,9 +33,12 @@ public final class GradleVersions {
 	}
 
 	public static List<String> allCompatible() {
-		if (isJavaVersion(JavaVersion.VERSION_23)) {
+		if (isJavaVersion(JavaVersion.VERSION_24)) {
 			return Arrays.asList(GradleVersion.current().getVersion());
 		}
+		if (isJavaVersion(JavaVersion.VERSION_23)) {
+			return Arrays.asList("8.10", GradleVersion.current().getVersion());
+		}
 		if (isJavaVersion(JavaVersion.VERSION_22)) {
 			return Arrays.asList("8.8", GradleVersion.current().getVersion());
 		}