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 1cae3eaa..a8fab3c2 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
@@ -11,7 +11,6 @@ package dev.msfjarvis.claw.gradle
 import com.android.build.api.dsl.ApplicationExtension
 import com.android.build.api.dsl.LibraryExtension
 import com.android.build.api.variant.ApplicationAndroidComponentsExtension
-import com.android.build.api.variant.HasUnitTestBuilder
 import com.android.build.api.variant.LibraryAndroidComponentsExtension
 import com.android.build.gradle.BaseExtension
 import dev.msfjarvis.claw.gradle.LintConfig.configureLint
@@ -74,7 +73,7 @@ private fun Project.configureSlimTests() {
   // Disable unit test tasks on the release build type for Android Library projects
   extensions.findByType<LibraryAndroidComponentsExtension>()?.run {
     beforeVariants(selector().withBuildType("release")) {
-      (it as HasUnitTestBuilder).enableUnitTest = false
+      it.enableUnitTest = false
       it.enableAndroidTest = false
     }
   }
@@ -82,7 +81,7 @@ private fun Project.configureSlimTests() {
   // Disable unit test tasks on the release build type for Android Application projects.
   extensions.findByType<ApplicationAndroidComponentsExtension>()?.run {
     beforeVariants(selector().withBuildType("release")) {
-      (it as HasUnitTestBuilder).enableUnitTest = false
+      it.enableUnitTest = false
       it.enableAndroidTest = false
     }
   }
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
index c89d3f99..f39689b7 100644
--- a/common/build.gradle.kts
+++ b/common/build.gradle.kts
@@ -6,8 +6,6 @@
  */
 @file:Suppress("UnstableApiUsage")
 
-import com.android.build.api.variant.HasUnitTestBuilder
-
 plugins {
   id("dev.msfjarvis.claw.android-library")
   id("dev.msfjarvis.claw.kotlin-android")
@@ -27,7 +25,7 @@ android {
   namespace = "dev.msfjarvis.claw.common"
 }
 
-androidComponents { beforeVariants { (it as HasUnitTestBuilder).enableUnitTest = false } }
+androidComponents { beforeVariants { it.enableUnitTest = false } }
 
 anvil { generateDaggerFactories.set(true) }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f3e78128..8f70d794 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 accompanist = "0.30.1"
-agp = "8.1.0-beta01"
+agp = "8.0.0"
 coil = "2.3.0"
 # @keep used for kotlinCompilerExtensionVersion
 composeCompiler = "1.4.4"