diff --git a/gradle.properties b/gradle.properties
index 23bb091b..49c1f23a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -63,13 +63,12 @@ android.defaults.buildfeatures.shaders=false
 # Experimental features
 android.disableEarlyManifestParsing=true
 android.enablePartialRIncrementalBuilds=true
-# TODO: enable once we're back on AGP 8.x
-# android.experimental.testOptions.uninstallIncompatibleApks=true
+android.experimental.testOptions.uninstallIncompatibleApks=true
 android.enableBuildConfigAsBytecode=true
 android.experimental.enableNewResourceShrinker.preciseShrinking=true
 
 # Disable warnings about unsupported features, we know what we're doing
-android.suppressUnsupportedOptionWarnings=android.disableEarlyManifestParsing,android.enablePartialRIncrementalBuilds,android.enableBuildConfigAsBytecode,android.experimental.enableNewResourceShrinker.preciseShrinking,android.suppressUnsupportedOptionWarnings
+android.suppressUnsupportedOptionWarnings=android.disableEarlyManifestParsing,android.enablePartialRIncrementalBuilds,android.experimental.testOptions.uninstallIncompatibleApks,android.enableBuildConfigAsBytecode,android.experimental.enableNewResourceShrinker.preciseShrinking,android.suppressUnsupportedOptionWarnings
 
 # Maven publishing
 GROUP=com.github.android-password-store
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a22a90ee..5f9939e2 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,7 +1,6 @@
 [versions]
 accompanist = "0.28.0"
-# @pin https://issuetracker.google.com/issues/259556213
-agp = "7.3.1"
+agp = "8.0.0-alpha10"
 androidx-test = "1.5.0"
 coil = "2.2.2"
 # @keep used for kotlinCompilerExtensionVersion