diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index fca12df0..6417aa30 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -84,9 +84,9 @@ android {
             isShrinkResources = false
         }
     }
-    applicationVariants.forEach { variant ->
-        variant.outputs.map { it as BaseVariantOutputImpl }.forEach { output ->
-            output.outputFileName = "LSPosedManager-${defaultConfig.versionName}-${defaultConfig.versionCode}-${variant.buildType.name}.apk"
+    applicationVariants.all {
+        outputs.map { it as BaseVariantOutputImpl }.forEach { output ->
+            output.outputFileName = "LSPosedManager-${defaultConfig.versionName}-${defaultConfig.versionCode}-${buildType.name}.apk"
         }
     }
 }
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 62804973..bebe775e 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -174,8 +174,8 @@ afterEvaluate {
             val excludeList = arrayOf("util_functions.sh")
             doLast {
                 val dexOutPath = if (variant.name.contains("release"))
-                    "buildDir/intermediates/dex/variantLowered/minify${variantCapped}WithR8" else
-                    "buildDir/intermediates/dex/variantLowered/mergeDex$variantCapped"
+                    "$buildDir/intermediates/dex/$variantLowered/minify${variantCapped}WithR8" else
+                    "$buildDir/intermediates/dex/$variantLowered/mergeDex$variantCapped"
                 copy {
                     from(dexOutPath) {
                         rename("classes.dex", "lspd.dex")