diff --git a/build.gradle b/build.gradle
index 28475e332b..578335d56c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -207,13 +207,6 @@ subprojects {
     afterEvaluate{
         if (it.hasProperty('android')) {
             android {
-                // This shouldn't be needed anymore with AGP 8.1.0+
-                // https://kotlinlang.org/docs/gradle-configure-project.html#gradle-java-toolchains-support
-                compileOptions {
-                    sourceCompatibility rootProject.ext.build.jvmTargetCompatibility
-                    targetCompatibility rootProject.ext.build.jvmTargetCompatibility
-                }
-
                 buildFeatures {
                     buildConfig true
                 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 384a08011e..cb43455459 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -5,7 +5,7 @@
 
 [versions]
 # AGP
-android-plugin = "8.0.2"
+android-plugin = "8.7.3"
 
 # Google
 protobuf = "4.29.0"