diff --git a/build.gradle b/build.gradle
index ea69ad98f6..ab51160dc3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -119,7 +119,7 @@ android {
         targetSdkVersion 32
 
         //versionNameSuffix " beta_(2023-01-10)" // " beta_(XXXX-XX-XX)" // activate for beta versions
-        versionCode 13005
+        versionCode 130
         versionName "1.6.3"
         //resConfigs "en"
 
@@ -226,5 +226,15 @@ android {
         disable 'ExtraTranslation', 'MissingTranslation', 'InvalidPackage', 'MissingQuantity', 'AppCompatResource', 'RestrictedApi'
         error 'StringFormatInvalid', 'StringFormatMatches'
     }
+    android.applicationVariants.all { variant ->
+        variant.outputs.each { output ->
+            def baseAbiVersionCode = project.ext.abiCodes.get(output.getFilter(com.android.build.OutputFile.ABI))
+            if (baseAbiVersionCode != null) {
+                output.versionCodeOverride = (100 * project.android.defaultConfig.versionCode) + baseAbiVersionCode
+            } else {
+                output.versionCodeOverride = (100 * project.android.defaultConfig.versionCode) + grgit.log(includes: ["HEAD"], excludes: [tags.last()]).size()
+            }
+        }
 
+    }
 }
diff --git a/fastlane/metadata/android/de/changelogs/13005.txt b/fastlane/metadata/android/de/changelogs/130.txt
similarity index 100%
rename from fastlane/metadata/android/de/changelogs/13005.txt
rename to fastlane/metadata/android/de/changelogs/130.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/13005.txt b/fastlane/metadata/android/en-US/changelogs/130.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/13005.txt
rename to fastlane/metadata/android/en-US/changelogs/130.txt