diff --git a/build.gradle b/build.gradle
index 56409772f..1ab80feb3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -147,8 +147,8 @@ android {
     }
 
 
-    android.applicationVariants.all { variant ->
-        variant.outputs.all { output ->
+    android.applicationVariants.configureEach { variant ->
+        variant.outputs.configureEach { output ->
             def releaseTime = new Date().format("yyyy-MM-dd", TimeZone.getTimeZone("UTC"))
             def fileName = "osu!droid-${defaultConfig.versionName}-${variant.buildType.name}-${releaseTime}.apk"
             outputFileName = fileName
diff --git a/gradle.properties b/gradle.properties
index cc220e004..909b12dfe 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 #Thu Oct 06 22:58:27 CST 2016
-android.enableJetifier=true
+android.enableJetifier=false
 android.nonFinalResIds=false
 android.nonTransitiveRClass=true
 android.useAndroidX=true