diff --git a/build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/AndroidCommonPlugin.kt b/build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/AndroidCommonPlugin.kt
index 787f75f9..e2a98c05 100644
--- a/build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/AndroidCommonPlugin.kt
+++ b/build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/AndroidCommonPlugin.kt
@@ -72,7 +72,7 @@ class AndroidCommonPlugin : Plugin<Project> {
       beforeVariants(selector().all()) {
         if (it.name == "debug") return@beforeVariants
         (it as HasUnitTestBuilder).enableUnitTest = false
-        it.androidTest.enable = false
+        it.enableAndroidTest = false
       }
     }
 
@@ -81,7 +81,7 @@ class AndroidCommonPlugin : Plugin<Project> {
       beforeVariants(selector().all()) {
         if (it.name == "debug") return@beforeVariants
         (it as HasUnitTestBuilder).enableUnitTest = false
-        it.androidTest.enable = false
+        it.enableAndroidTest = false
       }
     }
   }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 157e5157..858d7814 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "8.3.0-alpha16"
+agp = "8.2.0"
 benchmark = "1.2.2"
 coil = "2.5.0"
 # @keep used for kotlinCompilerExtensionVersion