diff --git a/build.gradle b/build.gradle
index 314526a0cde8736c3c6c2599f77783276d921891..7d88b4f5dd49d0c41df7c28f611fa8780be21a59 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,6 +10,10 @@ buildscript {
     }
 }
 
+plugins {
+    id 'org.ajoberstar.grgit' version '4.1.1'
+}
+
 apply plugin: 'com.android.application'
 
 repositories {
@@ -108,8 +112,8 @@ android {
     defaultConfig {
         minSdkVersion 24
         targetSdkVersion 29
-        versionCode 42024
-        versionName "2.10.3-beta"
+        versionCode 42024 + grgit.tag.list().size()
+        versionName grgit.describe(tags: true, always: true)
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
         resValue "string", "applicationId", applicationId