diff --git a/app/build.gradle b/app/build.gradle
index 60210fd6c0..cd73fe44c7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -263,12 +263,15 @@ android.applicationVariants.all { variant ->
         println("versionName override: $versionName")
 
         variant.outputs.each { output ->
+            def isMozillaOnline = project.hasProperty("mozillaOnline") || gradle.hasProperty("localProperties.mozillaOnline")
             def abi = output.getFilter(OutputFile.ABI)
+            // If it is a Mozilla Online build, use a unified version code of armeabi-v7a
+            def arch = (isMozillaOnline) ? "armeabi-v7a" : abi
             // We use the same version code generator, that we inherited from Fennec, across all channels - even on
             // channels that never shipped a Fennec build.
-            def versionCodeOverride = Config.generateFennecVersionCode(abi)
+            def versionCodeOverride = Config.generateFennecVersionCode(arch)
 
-            println("versionCode for $abi = $versionCodeOverride")
+            println("versionCode for $abi = $versionCodeOverride, isMozillaOnline = $isMozillaOnline")
 
             output.versionNameOverride = versionName
             output.versionCodeOverride = versionCodeOverride