diff --git a/build.gradle b/build.gradle
index 79a36bb81..776ccfd2e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -135,16 +135,16 @@ android {
         variant.resValue 'string', 'applicationId', variant.applicationId
 
         variant.outputs.configureEach {
+            if (variant.flavorName == 'nightly') {
+                setVersionCodeOverride(getVersionCode())
+                setVersionNameOverride(getVersionName())
+            }
+
             if (variant.flavorName == 'reproducible') {
                 outputFileName = "${applicationId}_${variant.versionName}.apk"
             } else {
                 outputFileName = "${applicationId}_${variant.versionCode}.apk"
             }
-
-            if (variant.flavorName == 'nightly') {
-                setVersionCodeOverride(getVersionCode())
-                setVersionNameOverride(getVersionName())
-            }
         }
     }