diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index febbf2379..bcc1720bf 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -66,7 +66,11 @@ android {
 }
 
 // Ensure Baseline Profile is fresh for release builds.
-baselineProfile.automaticGenerationDuringBuild = true
+baselineProfile {
+    variants.getByName("release") {
+        automaticGenerationDuringBuild = true
+    }
+}
 
 dependencies {
     implementation(projects.feature.interests.api)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index ae906034c..7769f6d28 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,7 +3,7 @@ accompanist = "0.37.0"
 androidDesugarJdkLibs = "2.1.4"
 # AGP and tools should be updated together
 androidGradlePlugin = "9.2.1"
-androidTools = "32.0.0"
+androidTools = "32.2.1"
 androidxActivity = "1.9.3"
 androidxAppCompat = "1.7.0"
 androidxBrowser = "1.8.0"