diff --git a/app/build.gradle b/app/build.gradle
index 67b645c7..f7727845 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -88,7 +88,8 @@ android {
         release {
             minifyEnabled true
             shrinkResources true
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            // NOTE: Do not use 'proguard-android-optimize.txt' as it breaks the mapping overrides
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.release
             manifestPlaceholders = [appName: "@string/tb_app_name"]
 
diff --git a/app/src/androidx86/AndroidManifest.xml b/app/src/androidx86/AndroidManifest.xml
index 1a67bdd4..4a8e1b53 100644
--- a/app/src/androidx86/AndroidManifest.xml
+++ b/app/src/androidx86/AndroidManifest.xml
@@ -19,7 +19,7 @@
      * HomeActivity is enabled by default
      * Certain activities and receivers are not exposed
 -->
-<manifest android:versionCode="205"
+<manifest android:versionCode="206"
           android:versionName="6.2.1"
           xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
diff --git a/dependencies.gradle b/dependencies.gradle
index b2a6ce78..0be8e012 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -1,7 +1,7 @@
 allprojects {
     ext {
         // TODO keep version name and version code in sync with Android-x86 manifest
-        VERSION_CODE = 205
+        VERSION_CODE = 206
         VERSION_NAME = "6.2.1"
 
         MIN_SDK_VERSION = 21