diff --git a/build.gradle b/build.gradle
index 84255d160..e86dda202 100644
--- a/build.gradle
+++ b/build.gradle
@@ -113,11 +113,11 @@ android {
         }
     }
 
-    applicationVariants.all { variant ->
+    applicationVariants.configureEach { variant ->
         variant.resValue "string", "applicationId", variant.applicationId
 
         if (variant.buildType.name == 'nightly') {
-            variant.outputs.all {
+            variant.outputs.configureEach {
                 setVersionCodeOverride(getVersionCode())
                 setVersionNameOverride(getVersionName())
                 outputFileName = "${applicationId}_${variant.versionCode}.apk"