diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 766f6e7f..397195ba 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -205,7 +205,7 @@ dependencies {
     implementation("androidx.recyclerview:recyclerview:1.2.1")
     implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01")
     implementation("com.github.bumptech.glide:glide:$glideVersion")
-    implementation("com.google.android.material:material:1.6.0-alpha02")
+    implementation("com.google.android.material:material:1.6.0-alpha03")
     implementation("com.google.code.gson:gson:2.9.0")
     implementation(platform("com.squareup.okhttp3:okhttp-bom:4.9.3"))
     implementation("com.squareup.okhttp3:okhttp")
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 63d075e8..62c84703 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -193,8 +193,8 @@ fun afterEval() = android.applicationVariants.forEach { variant ->
     val prepareMagiskFilesTask = task<Sync>("prepareMagiskFiles$variantCapped") {
         dependsOn(
             "assemble$variantCapped",
-            ":app:assemble$buildTypeCapped",
-            ":daemon:assemble$buildTypeCapped"
+            ":app:package$buildTypeCapped",
+            ":daemon:package$buildTypeCapped"
         )
         into(magiskDir)
         from("${rootProject.projectDir}/README.md")
@@ -238,11 +238,11 @@ fun afterEval() = android.applicationVariants.forEach { variant ->
                 filter<FixCrLfFilter>("eol" to FixCrLfFilter.CrLf.newInstance("lf"))
             }
         }
-        from("${project(":app").buildDir}/$apkDir/apk/${buildTypeLowered}") {
+        from(project(":app").tasks.getByName("package$buildTypeCapped").outputs) {
             include("*.apk")
             rename(".*\\.apk", "manager.apk")
         }
-        from("${project(":daemon").buildDir}/$apkDir/apk/${buildTypeLowered}") {
+        from(project(":daemon").tasks.getByName("package$buildTypeCapped").outputs) {
             include("*.apk")
             rename(".*\\.apk", "daemon.apk")
         }
@@ -328,7 +328,14 @@ val pushDaemonNative = task<Exec>("pushDaemonNative") {
 val reRunDaemon = task<Exec>("reRunDaemon") {
     dependsOn(pushDaemon, pushDaemonNative, killLspd)
     // tricky to pass a minus number to avoid the injection warning
-    commandLine(adb, "shell", "ASH_STANDALONE=1", "su", "-pc", "/data/adb/magisk/busybox sh /data/adb/modules/*_lsposed/service.sh --system-server-max-retry=-1&")
+    commandLine(
+        adb,
+        "shell",
+        "ASH_STANDALONE=1",
+        "su",
+        "-pc",
+        "/data/adb/magisk/busybox sh /data/adb/modules/*_lsposed/service.sh --system-server-max-retry=-1&"
+    )
     isIgnoreExitValue = true
 }
 val tmpApk = "/data/local/tmp/lsp.apk"
@@ -356,3 +363,6 @@ task<Exec>("reRunApp") {
     isIgnoreExitValue = true
     finalizedBy(reRunDaemon)
 }
+
+evaluationDependsOn(":app")
+evaluationDependsOn(":daemon")