diff --git a/build.gradle b/build.gradle
index d530a57490b409dfe662eaeaaca71037bbd34752..570b0144fc7861ff0a07fd3811bf8b97b04a63cb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -130,7 +130,7 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 34
-        versionCode 4204897
+        versionCode 42025 + tags.size()
         versionName grgit.describe(always: true)
         applicationId "eu.siacs.conversations"
         def appName = "Conversations"
@@ -304,7 +304,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) {
@@ -314,5 +314,5 @@ android {
             }
         }
 
-    }*/
+    }
 }