diff --git a/CHANGELOG.md b/CHANGELOG.md
index b9227af42..c2bb0a938 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+### Version 2.10.2
+
+* Fix crash when rendering some quotes
+* Fix crash in welcome screen
+
 ### Version 2.10.1
 
 * Fix issue with some videos not being compressed
diff --git a/build.gradle b/build.gradle
index 442b2a500..8edf10065 100644
--- a/build.gradle
+++ b/build.gradle
@@ -92,8 +92,8 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 42022
-        versionName "2.10.1"
+        versionCode 42023
+        versionName "2.10.2"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
         resValue "string", "applicationId", applicationId
@@ -277,7 +277,9 @@ android {
         variant.outputs.each { output ->
             def baseAbiVersionCode = project.ext.abiCodes.get(output.getFilter(com.android.build.OutputFile.ABI))
             if (baseAbiVersionCode != null) {
-                output.versionCodeOverride = (100 * variant.versionCode) + baseAbiVersionCode
+                output.versionCodeOverride = (100 * project.android.defaultConfig.versionCode) + baseAbiVersionCode
+            } else {
+                output.versionCodeOverride = 100 * project.android.defaultConfig.versionCode
             }
         }
 
diff --git a/fastlane/metadata/android/en-US/changelogs/42023.txt b/fastlane/metadata/android/en-US/changelogs/42023.txt
new file mode 100644
index 000000000..ed3c25380
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/42023.txt
@@ -0,0 +1,2 @@
+* Fix crash when rendering some quotes
+* Fix crash in welcome screen