diff --git a/benchmark/build.gradle.kts b/benchmark/build.gradle.kts
index 0ed02d55e..86b9d2340 100644
--- a/benchmark/build.gradle.kts
+++ b/benchmark/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     alias(libs.plugins.android.test)
-    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.android.builtInKotlin)
     alias(libs.plugins.baselineprofile)
 }
 
diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt
index 1875724a2..435fb6293 100644
--- a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt
@@ -16,8 +16,8 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidExtension
 @Suppress("unused")
 class AndroidApplicationConventionPlugin : Plugin<Project> {
     override fun apply(target: Project) = with(target) {
-        apply(plugin = libs.plugins.kotlin.android.get().pluginId)
         apply(plugin = libs.plugins.android.application.get().pluginId)
+        apply(plugin = libs.plugins.android.builtInKotlin.get().pluginId)
         apply(plugin = libs.plugins.compose.compiler.get().pluginId)
         apply(plugin = libs.plugins.composeCompilerReportGenerator.get().pluginId)
 
diff --git a/build-logic/convention/src/main/kotlin/MultiplatformLibraryConventionPlugin.kt b/build-logic/convention/src/main/kotlin/MultiplatformLibraryConventionPlugin.kt
index d3bc69c95..8b05db5db 100644
--- a/build-logic/convention/src/main/kotlin/MultiplatformLibraryConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/MultiplatformLibraryConventionPlugin.kt
@@ -1,6 +1,5 @@
 import com.android.build.api.dsl.KotlinMultiplatformAndroidLibraryTarget
 import com.android.build.api.dsl.Lint
-import com.android.build.api.dsl.androidLibrary
 import com.ehviewer.configureKotlin
 import com.ehviewer.configureLint
 import com.ehviewer.configureSpotless
@@ -43,7 +42,7 @@ class MultiplatformLibraryConventionPlugin : Plugin<Project> {
             //     }
             // }
 
-            androidLibrary {
+            configure<KotlinMultiplatformAndroidLibraryTarget> {
                 namespace = "com.ehviewer${path.replace(':', '.')}"
 
                 withHostTestBuilder {
diff --git a/build.gradle.kts b/build.gradle.kts
index dbef7b65d..79011325f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,11 +1,11 @@
 plugins {
     alias(libs.plugins.android.application) apply false
+    alias(libs.plugins.android.builtInKotlin) apply false
     alias(libs.plugins.android.kotlin.multiplatform.library) apply false
     alias(libs.plugins.android.library) apply false
     alias(libs.plugins.android.lint) apply false
     alias(libs.plugins.compose.compiler) apply false
     alias(libs.plugins.compose.multiplatform) apply false
-    alias(libs.plugins.kotlin.android) apply false
     alias(libs.plugins.kotlin.multiplatform) apply false
     alias(libs.plugins.kotlin.serialization) apply false
     alias(libs.plugins.ksp) apply false
diff --git a/gradle.properties b/gradle.properties
index d4cf90662..290fe566e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,13 +19,11 @@ org.gradle.parallel=true
 org.gradle.caching=true
 org.gradle.configuration-cache=true
 
-# TODO: These will become default in AGP 9.0
-android.useAndroidX=true
-android.enableAppCompileTimeRClass=true
-android.defaults.buildfeatures.resvalues=false
-android.defaults.buildfeatures.shaders=false
-android.r8.optimizedResourceShrinking=true
-android.r8.strictFullModeForKeepRules=true
+# https://github.com/icerockdev/moko-resources/issues/820
+android.builtInKotlin=false
 
-# https://github.com/google/ksp/issues/2375
-ksp.version.check=false
+# https://issuetracker.google.com/443268525
+android.newDsl=false
+
+# https://github.com/icerockdev/moko-resources/issues/852
+android.sourceset.disallowProvider=false
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e6b22aec6..646db1aaa 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 aboutlibraries = "13.2.1"
 accompanist = "0.37.3"
-agp = "8.13.2"
+agp = "9.0.0"
 androidx-activity = "1.12.2"
 androidx-appcompat = "1.7.1"
 androidx-biometric = "1.4.0-alpha05"
@@ -144,13 +144,13 @@ splitties = ["splitties-appctx", "splitties-systemservices"]
 aboutlibraries = { id = "com.mikepenz.aboutlibraries.plugin", version.ref = "aboutlibraries" }
 aboutlibrariesAndroid = { id = "com.mikepenz.aboutlibraries.plugin.android", version.ref = "aboutlibraries" }
 android-application = { id = "com.android.application", version.ref = "agp" }
+android-builtInKotlin = { id = "com.android.built-in-kotlin", version.ref = "agp" }
 android-kotlin-multiplatform-library = { id = "com.android.kotlin.multiplatform.library", version.ref = "agp" }
 android-library = { id = "com.android.library", version.ref = "agp" }
 android-lint = { id = "com.android.lint", version.ref = "agp" }
 composeCompilerReportGenerator = { id = "dev.shreyaspatil.compose-compiler-report-generator", version = "1.5.0" }
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 compose-multiplatform = { id = "org.jetbrains.compose", version.ref = "compose-multiplatform" }
-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 93fd57b54..2859d03e7 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -28,7 +28,7 @@ dependencyResolutionManagement {
 }
 
 plugins {
-    id("com.android.settings") version "8.13.2"
+    id("com.android.settings") version "9.0.0"
 }
 
 android {