diff --git a/android/app/build.gradle b/android/app/build.gradle
index fa356b203..eb6f4fa70 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -128,6 +128,13 @@ android {
         applicationVariants.all { variant ->
             variant.resValue 'string', 'screen_saver_settings_activity', "${applicationId}/${packageName}.ScreenSaverSettingsActivity"
             variant.resValue 'string', 'search_provider', "${applicationId}.search_provider"
+
+            variant.outputs.each { output ->
+                def baseAbiVersionCode = rootProject.ext.abiCodes.get(output.getFilter(com.android.build.OutputFile.ABI))
+                if (baseAbiVersionCode != null) {
+                    output.versionCodeOverride = variant.versionCode * 100 + baseAbiVersionCode
+                }
+            }
         }
 
         android.productFlavors.each { flavor ->
diff --git a/android/build.gradle b/android/build.gradle
index d1da67889..d3a84d964 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,9 +1,11 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = '1.7.20'
-
-    ext.useCrashlytics = gradle.startParameter.taskNames.any { task -> task.containsIgnoreCase("play") }
-    ext.useHms = gradle.startParameter.taskNames.any { task -> task.containsIgnoreCase("huawei") }
+    ext {
+        kotlin_version = '1.7.20'
+        abiCodes = ['armeabi-v7a': 1, 'arm64-v8a': 2, 'x86': 3, 'x86_64': 4]
+        useCrashlytics = gradle.startParameter.taskNames.any { task -> task.containsIgnoreCase("play") }
+        useHms = gradle.startParameter.taskNames.any { task -> task.containsIgnoreCase("huawei") }
+    }
 
     repositories {
         google()