diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9c2e22ba1..9c47b7393 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,11 +18,11 @@ jobs:
         with:
           submodules: 'recursive'
 
-      - name: Setup Java 17
+      - name: Setup Java 21
         uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
 
       - name: Install Rust Toolchain
         run: rustup update && rustup target add armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android && rustup component add rustfmt clippy
diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml
index 696c9d235..85c500e67 100644
--- a/.github/workflows/releases.yml
+++ b/.github/workflows/releases.yml
@@ -15,11 +15,11 @@ jobs:
         with:
           submodules: 'recursive'
 
-      - name: Setup Java 17
+      - name: Setup Java 21
         uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
 
       - name: Install Rust Toolchain
         run: rustup update && rustup target add armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 78b4d8693..5ca8447fd 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -129,12 +129,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
 
     kotlinOptions {
-        jvmTarget = "17"
+        jvmTarget = "21"
         freeCompilerArgs = listOf(
             // https://kotlinlang.org/docs/compiler-reference.html#progressive
             "-progressive",
@@ -281,6 +281,12 @@ dependencies {
     "gmsImplementation"(libs.bundles.cronet)
 }
 
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
+}
+
 ksp {
     arg("room.schemaLocation", "$projectDir/schemas")
     arg("room.generateKotlin", "true")
diff --git a/build.gradle.kts b/build.gradle.kts
index 81a014ce7..429cf9ff1 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -9,13 +9,3 @@ plugins {
     alias(libs.plugins.rustAndroidPlugin) apply false
     alias(libs.plugins.composeCompilerReportGenerator) apply false
 }
-
-tasks.register("Delete", Delete::class) {
-    delete(rootProject.layout.buildDirectory)
-}
-
-buildscript {
-    dependencies {
-        classpath(libs.r8)
-    }
-}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 46b4e5380..712c2a88b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,7 +1,6 @@
 [versions]
 aboutlibraries = "10.9.1"
 agp = "8.3.0-alpha07"
-android-tools-r8 = "8.3.6-dev"
 androidx-activity = "1.8.0"
 androidx-appcompat = "1.6.1"
 androidx-biometric = "1.2.0-alpha05"
@@ -23,12 +22,13 @@ arrow = "1.2.1"
 chucker = "4.0.0"
 coil = "2.4.0"
 compose-bom = "2023.11.00-alpha01"
-compose-compiler = "1.5.3"
+compose-compiler = "1.5.4-dev-k1.9.20-RC-1edce5fd625"
 google-accompanist = "0.32.0"
 google-android-material = "1.11.0-alpha03"
-kotlin = "1.9.10"
+kotlin = "1.9.20-RC"
 kotlinx-coroutines = "1.7.3"
 kotlinx-serialization = "1.6.0"
+ksp = "1.9.20-RC-1.0.13"
 ktlint = "1.0.1"
 ktor = "2.3.5"
 leakcanary = "2.12"
@@ -119,8 +119,6 @@ okio-jvm = { module = "com.squareup.okio:okio-jvm", version.ref = "okio" }
 
 photoview = "com.github.chrisbanes:PhotoView:2.3.0"
 
-r8 = { module = "com.android.tools:r8", version.ref = "android-tools-r8" }
-
 rikkax-core = "dev.rikka.rikkax.core:core-ktx:1.4.1"
 rikkax-insets = "dev.rikka.rikkax.insets:insets:1.3.0"
 rikkax-layoutinflater = "dev.rikka.rikkax.layoutinflater:layoutinflater:1.3.0"
@@ -151,6 +149,6 @@ composeCompilerReportGenerator = { id = "dev.shreyaspatil.compose-compiler-repor
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
-ksp = { id = "com.google.devtools.ksp", version = "1.9.10-1.0.13" }
+ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 rustAndroidPlugin = { id = "org.mozilla.rust-android-gradle.rust-android", version = "0.9.3" }
 spotless = { id = "com.diffplug.spotless", version = "6.22.0" }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 8c28e8012..103108a90 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -3,7 +3,6 @@ pluginManagement {
         gradlePluginPortal()
         google()
         mavenCentral()
-        maven("https://storage.googleapis.com/r8-releases/raw")
     }
 }