diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 2f02539435..2ba230387a 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -53,8 +53,6 @@ android {
             // who clones the code to sign and run the release variant, use the debug signing key.
             // TODO: Abstract the signing configuration to a separate file to avoid hardcoding this.
             signingConfig = signingConfigs.named("debug").get()
-            // Ensure Baseline Profile is fresh for release builds.
-            baselineProfile.automaticGenerationDuringBuild = true
         }
     }
 
@@ -145,6 +143,11 @@ baselineProfile {
 
     // Make use of Dex Layout Optimizations via Startup Profiles
     dexLayoutOptimization = true
+
+    // Ensure Baseline Profile is fresh for release builds.
+    variants.create("release") {
+        automaticGenerationDuringBuild = true
+    }
 }
 
 dependencyGuard {