diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 2f0253943..7f826bab3 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -150,3 +150,12 @@ baselineProfile {
 dependencyGuard {
     configuration("prodReleaseRuntimeClasspath")
 }
+
+tasks.configureEach {
+    if (name == "createProdNonMinifiedReleaseApkListingFileRedirect") {
+        val benchmarksProject = project.rootProject.findProject(":benchmarks")
+        benchmarksProject?.tasks?.matching {
+            it.name.contains("packageProdNonMinifiedRelease")
+        }?.let { dependsOn(it) }
+    }
+}
\ No newline at end of file
diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts
index 258993913..67b053ec6 100644
--- a/benchmarks/build.gradle.kts
+++ b/benchmarks/build.gradle.kts
@@ -26,7 +26,7 @@ android {
     defaultConfig {
         minSdk = 28
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-
+        testInstrumentationRunnerArguments["androidx.benchmark.enabledRules"] = "BaselineProfile"
         buildConfigField("String", "APP_BUILD_TYPE_SUFFIX", "\"\"")
     }