diff --git a/.github/workflows/baseline-profile.yml b/.github/workflows/baseline-profile.yml
index 2992f405a..6f34d4e14 100644
--- a/.github/workflows/baseline-profile.yml
+++ b/.github/workflows/baseline-profile.yml
@@ -31,7 +31,7 @@ jobs:
         uses: actions/setup-java@v5
         with:
           distribution: temurin
-          java-version: 21
+          java-version-file: .java-version
 
       - name: Install Rust Toolchain
         run: rustup target add thumbv7neon-linux-androideabi
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e19a49394..618a420d0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,7 +18,7 @@ jobs:
         uses: actions/setup-java@v5
         with:
           distribution: temurin
-          java-version: 21
+          java-version-file: .java-version
 
       - name: Install Rust Toolchain
         run: rustup target add thumbv7neon-linux-androideabi
@@ -61,7 +61,7 @@ jobs:
         uses: actions/setup-java@v5
         with:
           distribution: temurin
-          java-version: 21
+          java-version-file: .java-version
 
       - name: Install Rust Toolchain
         run: rustup target add thumbv7neon-linux-androideabi
@@ -133,7 +133,7 @@ jobs:
         uses: actions/setup-java@v5
         with:
           distribution: temurin
-          java-version: 21
+          java-version-file: .java-version
 
       - name: Install Rust Toolchain
         run: rustup target add thumbv7neon-linux-androideabi
diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml
index 02fb162cd..a2145ef74 100644
--- a/.github/workflows/releases.yml
+++ b/.github/workflows/releases.yml
@@ -25,7 +25,7 @@ jobs:
         uses: actions/setup-java@v5
         with:
           distribution: temurin
-          java-version: 21
+          java-version-file: .java-version
 
       - name: Install Rust Toolchain
         run: rustup target add thumbv7neon-linux-androideabi
diff --git a/.java-version b/.java-version
new file mode 100644
index 000000000..410b14d2c
--- /dev/null
+++ b/.java-version
@@ -0,0 +1 @@
+25
\ No newline at end of file
diff --git a/benchmark/build.gradle.kts b/benchmark/build.gradle.kts
index 7275e7d1d..e77c20874 100644
--- a/benchmark/build.gradle.kts
+++ b/benchmark/build.gradle.kts
@@ -29,7 +29,8 @@ android {
 }
 
 kotlin {
-    jvmToolchain(21)
+    val javaVersion = libs.versions.java.get().toInt()
+    jvmToolchain(javaVersion)
 }
 
 baselineProfile {
diff --git a/build-logic/convention/build.gradle.kts b/build-logic/convention/build.gradle.kts
index 9e94e07c0..fb32b230a 100644
--- a/build-logic/convention/build.gradle.kts
+++ b/build-logic/convention/build.gradle.kts
@@ -30,7 +30,8 @@ gradlePlugin {
 }
 
 kotlin {
-    jvmToolchain(21)
+    val javaVersion = libs.versions.java.get().toInt()
+    jvmToolchain(javaVersion)
 }
 
 spotless {
diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt
index 7ec474de5..7cf2b3b23 100644
--- a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt
@@ -21,7 +21,8 @@ class AndroidApplicationConventionPlugin : Plugin<Project> {
         apply(plugin = libs.plugins.composeCompilerReportGenerator.get().pluginId)
 
         configure<KotlinAndroidExtension> {
-            jvmToolchain(21)
+            val javaVersion = libs.versions.java.get().toInt()
+            jvmToolchain(javaVersion)
             compilerOptions {
                 configureKotlin(includeKotlinX = true)
                 configureKotlinCompose()
diff --git a/build-logic/convention/src/main/kotlin/MultiplatformLibraryConventionPlugin.kt b/build-logic/convention/src/main/kotlin/MultiplatformLibraryConventionPlugin.kt
index 3b45bfc37..7539ffaa6 100644
--- a/build-logic/convention/src/main/kotlin/MultiplatformLibraryConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/MultiplatformLibraryConventionPlugin.kt
@@ -22,7 +22,8 @@ class MultiplatformLibraryConventionPlugin : Plugin<Project> {
         apply(plugin = libs.plugins.android.lint.get().pluginId)
 
         configure<KotlinMultiplatformExtension> {
-            jvmToolchain(21)
+            val javaVersion = libs.versions.java.get().toInt()
+            jvmToolchain(javaVersion)
             compilerOptions {
                 configureKotlin(includeKotlinX = path != ":core:i18n")
             }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 918d8e4a4..f497f32fb 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -20,6 +20,7 @@ compose-bom = "2026.05.00"
 compose-multiplatform = "1.11.0"
 compose-destinations = "2.3.0"
 compose-preference = "2.2.0"
+java = "25"
 kotlin = "2.3.21"
 kotlinx-coroutines = "1.11.0"
 kotlinx-datetime = "0.8.0"