diff --git a/edxp-yahfa/build.gradle b/edxp-yahfa/build.gradle
index e53a6048..4af8c8a7 100644
--- a/edxp-yahfa/build.gradle
+++ b/edxp-yahfa/build.gradle
@@ -13,7 +13,7 @@ android {
 
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
@@ -57,7 +57,7 @@ afterEvaluate {
 
         task("makeAndCopy${variantNameCapped}", type: Jar, dependsOn: "assemble${variantNameCapped}") {
             dependsOn tasks.getByPath(":edxp-common:copyCommonProperties")
-            from "${buildDir}/intermediates/dex/${variantNameLowered}/mergeDex${variantNameCapped}/out/"
+            from "${buildDir}/intermediates/transforms/dexMerger/${variantNameLowered}/0/"
             destinationDir file(myTemplatePath + "system/framework/")
             baseName "edxp"
             doLast {
diff --git a/xposed-bridge/build.gradle b/xposed-bridge/build.gradle
index 3423f37f..ce94b0e1 100644
--- a/xposed-bridge/build.gradle
+++ b/xposed-bridge/build.gradle
@@ -5,7 +5,6 @@ android {
     buildToolsVersion '28.0.3'
 
     defaultConfig {
-        multiDexEnabled false
         minSdkVersion 23
     }