diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 3750b651..6b5032cc 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -16,7 +16,6 @@
 
 plugins {
     alias(libs.plugins.android.application)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.secrets.gradle.plugin)
 }
 
diff --git a/build-logic/convention/src/main/kotlin/PublishingConventionPlugin.kt b/build-logic/convention/src/main/kotlin/PublishingConventionPlugin.kt
index 2fdc51c8..07d6b72f 100644
--- a/build-logic/convention/src/main/kotlin/PublishingConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/PublishingConventionPlugin.kt
@@ -43,9 +43,7 @@ class PublishingConventionPlugin : Plugin<Project> {
         extensions.configure<MavenPublishBaseExtension> {
             configure(
                 AndroidSingleVariantLibrary(
-                    variant = "release",
-                    sourcesJar = true,
-                    publishJavadocJar = true
+                    variant = "release"
                 )
             )
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 3533ed77..7e560b1c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -16,8 +16,7 @@
 
 plugins {
     alias(libs.plugins.android.application) apply false
-    alias(libs.plugins.kotlin.android) apply false
-    id("org.jetbrains.dokka") version "2.1.0"
+    alias(libs.plugins.dokka) apply false
     alias(libs.plugins.gradle.maven.publish) apply false
     alias(libs.plugins.secrets.gradle.plugin) apply false
 }
diff --git a/docs/build.gradle.kts b/docs/build.gradle.kts
index 1140413a..8dc9c0da 100644
--- a/docs/build.gradle.kts
+++ b/docs/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     kotlin("jvm") apply false
-    id("org.jetbrains.dokka")
+    alias(libs.plugins.dokka)
 }
 
 dependencies {
diff --git a/gradle.properties b/gradle.properties
index a246cae5..057d2c70 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,8 +15,6 @@ org.gradle.jvmargs=-Xmx1536m
 # Android operating system, and which are packaged with your app's APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
-# Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
 
@@ -25,18 +23,20 @@ kotlin.code.style=official
 signing.keyId=
 signing.password=
 signing.secretKeyRingFile=
-android.defaults.buildfeatures.buildconfig=true
 
 mavenCentralUsername=
 mavenCentralPassword=
 
 # Migration to AGP 8.2.1
 android.nonTransitiveRClass=false
-android.nonFinalResIds=false
 
 # Despite being deprecated, targeting lowest java version is needed to support old Android runtime
 android.javaCompile.suppressSourceTargetDeprecationWarning=true
 
 # Add a property to enable automatic release to Maven Central (optional, but good for CI)
 # If true, publishToMavenCentral will also close and release the staging repository
-mavenCentralAutomaticRelease=false
\ No newline at end of file
+mavenCentralAutomaticRelease=false
+android.uniquePackageNames=false
+android.dependency.useConstraints=true
+android.r8.strictFullModeForKeepRules=false
+android.generateSyncIssueWhenLibraryConstraintsAreEnabled=false
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 7696ed60..245bcddc 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -7,10 +7,9 @@ androidTargetSdk = "36"
 
 androidxAppcompat = "1.7.1"
 androidxCoreKtx = "1.17.0"
-# Increasing androidxActivityKtx or lifecycleRuntimeKtx will require us to upgrade the minSdk
 androidxActivityKtx = "1.12.4"
 lifecycleRuntimeKtx = "2.10.0"
-kotlin = "2.3.0"
+kotlin = "2.3.10"
 kotlinxCoroutines = "1.10.2"
 material = "1.13.0"
 androidxStartup = "1.2.0"
@@ -32,7 +31,7 @@ truth = "1.4.5"
 
 # --- Gradle Plugins ---
 # Versions for Gradle plugins used in the build process.
-agp = "8.13.2"
+agp = "9.0.1"
 dokkaGradlePlugin = "2.1.0"
 gradleMavenPublishPlugin = "0.36.0"
 jacocoAndroidGradlePlugin = "0.2.1"
diff --git a/maps-ktx/build.gradle.kts b/maps-ktx/build.gradle.kts
index 664359db..dd77d4a1 100644
--- a/maps-ktx/build.gradle.kts
+++ b/maps-ktx/build.gradle.kts
@@ -16,9 +16,8 @@
  */
 
 plugins {
-    alias(libs.plugins.kotlin.android)
     id("android.maps.ktx.PublishingConventionPlugin")
-    id("org.jetbrains.dokka")
+    alias(libs.plugins.dokka)
 }
 
 android {
@@ -55,6 +54,9 @@ android {
     namespace = "com.google.maps.android.ktx"
 }
 
+// Workaround for com.mxalbert.gradle.jacoco-android plugin crash on AGP 8.0+
+tasks.register("testReleaseUnitTest") {}
+
 dependencies {
     implementation(libs.kotlin.stdlib)
     implementation(libs.kotlinx.coroutines.android)
diff --git a/maps-utils-ktx/build.gradle.kts b/maps-utils-ktx/build.gradle.kts
index 5fbff0f6..5867f4bb 100644
--- a/maps-utils-ktx/build.gradle.kts
+++ b/maps-utils-ktx/build.gradle.kts
@@ -15,9 +15,8 @@
  */
 
 plugins {
-    alias(libs.plugins.kotlin.android)
     id("android.maps.ktx.PublishingConventionPlugin")
-    id("org.jetbrains.dokka")
+    alias(libs.plugins.dokka)
 }
 
 android {
@@ -54,6 +53,9 @@ android {
     namespace = "com.google.maps.android.ktx.utils"
 }
 
+// Workaround for com.mxalbert.gradle.jacoco-android plugin crash on AGP 8.0+
+tasks.register("testReleaseUnitTest") {}
+
 dependencies {
     implementation(libs.kotlin.stdlib)
     api(libs.android.maps.utils)