diff --git a/build.gradle b/build.gradle
index bdd65c7cccb2c98b13ea7c19d6c379d87d7a563a..fa09d66de75f33c9191fd99e3c9ff55f8458c3b5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -133,7 +133,7 @@ android {
     defaultConfig {
         minSdkVersion 23
         targetSdkVersion 34
-        versionCode 4204931
+        versionCode 42025 + tags.size()
         versionName grgit.describe(always: true)
         applicationId "eu.siacs.conversations"
         def appName = "Conversations"
@@ -307,7 +307,7 @@ android {
         buildConfig true
     }
 
-    /*android.applicationVariants.configureEach { variant ->
+    android.applicationVariants.configureEach { variant ->
         variant.outputs.each { output ->
             def baseAbiVersionCode = project.ext.abiCodes.get(output.getFilter(com.android.build.OutputFile.ABI))
             if (baseAbiVersionCode != null) {
@@ -317,5 +317,5 @@ android {
             }
         }
 
-    }*/
+    }
 }