diff --git a/.github/actions/prepare-gradle-build/action.yml b/.github/actions/prepare-gradle-build/action.yml
index 3ff8514fbbd..d1785dc6103 100644
--- a/.github/actions/prepare-gradle-build/action.yml
+++ b/.github/actions/prepare-gradle-build/action.yml
@@ -23,7 +23,7 @@ inputs:
   java-version:
     description: 'Java version to use for the build'
     required: false
-    default: '24'
+    default: '25'
 runs:
   using: composite
   steps:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f30698b74d1..647e1d5c4c6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,15 +23,13 @@ jobs:
             toolchain: true
           - version: 21
             toolchain: true
-          - version: 24
-            toolchain: false
           - version: 25
-            toolchain: true
+            toolchain: false
         exclude:
           - os:
               name: Linux
             java:
-              version: 24
+              version: 25
           - os:
               name: ${{ github.repository == 'spring-projects/spring-boot-commercial' && 'Windows' }}
     steps:
diff --git a/.sdkmanrc b/.sdkmanrc
index b280a1b6907..2b4236b43e3 100644
--- a/.sdkmanrc
+++ b/.sdkmanrc
@@ -1,3 +1,3 @@
 # Enable auto-env through the sdkman_auto_env config
 # Add key=value pairs of SDKs to use below
-java=24.0.2-librca
+java=25-librca