diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index d6e8bb7789..c0c71fffcc 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -11,10 +11,10 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: temurin
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
@@ -26,10 +26,10 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: temurin
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index 19c0d62365..8aca16e89b 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -19,10 +19,10 @@ jobs:
           ruby-version: 3.3.0
           bundler-cache: true
 
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: temurin
 
       - name: Set up Gradle
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
index 4fb7e39190..ae6f6996ae 100644
--- a/buildSrc/src/main/kotlin/Versions.kt
+++ b/buildSrc/src/main/kotlin/Versions.kt
@@ -9,7 +9,7 @@ object Versions {
     const val minSdk = 28
     const val targetSdk = 35
 
-    val java = JavaVersion.VERSION_17
+    val java = JavaVersion.VERSION_21
 
     const val ktlint = "0.50.0"
 }
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 8cc1c66ee4..1fe6e4037e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,17 +1,17 @@
 [versions]
 aboutlibraries = "11.2.3"
 android-desugar-jdk-libs = "2.1.2"
-android-plugin = "8.6.1"
+android-plugin = "8.7.0"
 androidx-activity = "1.9.2"
 androidx-appcompat = "1.7.0"
-androidx-compose = "1.7.2"
+androidx-compose = "1.7.3"
 androidx-compose-material3 = "1.3.0"
 androidx-constraintlayout = "2.1.4"
 androidx-core = "1.13.1"
 androidx-hilt = "1.2.0"
 androidx-lifecycle = "2.8.6"
 androidx-media3 = "1.4.1"
-androidx-navigation = "2.8.1"
+androidx-navigation = "2.8.2"
 androidx-paging = "3.3.2"
 androidx-preference = "1.2.1"
 androidx-recyclerview = "1.3.2"