diff --git a/build.gradle b/build.gradle
index 49b74fd3e8..26ced1269e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -161,13 +161,6 @@ android {
         buildConfigField "int", "QUICKSTEP_MAX_SDK", quickstepMaxSdk
     }
 
-    applicationVariants.configureEach { variant ->
-        variant.outputs.configureEach {
-            def channel = variant.productFlavors.last().name
-            outputFileName = "Lawnchair.${variant.versionName}.$channel.${variant.buildType.name}.apk"
-        }
-    }
-
     androidResources {
         generateLocaleConfig true
     }
@@ -220,16 +213,6 @@ android {
     buildTypes {
         all {
             signingConfig releaseSigning
-
-            applicationVariants.configureEach { variant ->
-                variant.outputs.configureEach {
-                    def channel = variant.productFlavors.last().name
-                    // Override signingConfig to debug if the "nightly" flavor is selected
-                    if (channel.any { it == "nightly" }) {
-                        signingConfig = signingConfigs.debug
-                    }
-                }
-            }
             pseudoLocalesEnabled true
         }
 
@@ -352,6 +335,15 @@ android {
     }
 }
 
+androidComponents {
+    onVariants(selector().all()) { variant ->
+        def channel = variant.productFlavors.last().second
+        variant.outputs.forEach { output ->
+            output.outputFileName.set("Lawnchair.${output.versionName.get()}.$channel.${variant.buildType}.apk")
+        }
+    }
+}
+
 baselineProfile {
     saveInSrc = true
     mergeIntoMain = true
diff --git a/gradle.properties b/gradle.properties
index 86c69cbdcb..eca42f8ec5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,6 +6,3 @@ org.gradle.parallel=true
 org.gradle.configuration-cache=true
 org.gradle.configuration-cache.parallel=true
 org.gradle.tooling.parallel=true
-
-# TODO: https://github.com/LawnchairLauncher/lawnchair/pull/6277
-android.newDsl=false
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 48e0702f2b..dcb8c6487b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -26,7 +26,7 @@ testRunner = "1.7.0"
 android-application = { id = "com.android.application", version.ref = "agp" }
 android-library = { id = "com.android.library", version.ref = "agp" }
 android-test = { id = "com.android.test", version.ref = "agp" }
-androidx-baselineprofile = "androidx.baselineprofile:1.4.1"
+androidx-baselineprofile = "androidx.baselineprofile:1.5.0-alpha06"
 
 kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }