diff --git a/android/build.gradle b/android/build.gradle
index 68e7f0acb3..1f26adb3b6 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -245,6 +245,9 @@ android {
   flavorDimensions "default"
 
   productFlavors {
+    final int HUAWEI_VERSION_CODE_BASE = 20000;
+    final int TENCENT_VERSION_CODE_BASE = 10000;
+
     google {
       dimension "default"
       versionName = android.defaultConfig.versionName + '-Google'
@@ -324,6 +327,7 @@ android {
     tencent {
       dimension "default"
       versionName = android.defaultConfig.versionName + '-Tencent'
+      versionCode TENCENT_VERSION_CODE_BASE + android.defaultConfig.versionCode
       android.sourceSets.tencent.assets.srcDirs = ['flavors/mwm-ttf-assets']
       buildConfigField 'String', 'REVIEW_URL', '"http://android.myapp.com/myapp/detail.htm?apkName=com.mapswithme.maps.pro"'
     }
@@ -361,6 +365,7 @@ android {
     huawei {
       dimension "default"
       versionName = android.defaultConfig.versionName + '-Huawei'
+      versionCode = HUAWEI_VERSION_CODE_BASE + android.defaultConfig.versionCode
       buildConfigField 'String', 'SUPPORT_MAIL', '"huawei@maps.me"'
       android.sourceSets.huawei.assets.srcDirs = ['flavors/mwm-ttf-assets']
     }
@@ -404,7 +409,7 @@ android {
           outputFileName = "../../" + file.name.replace(".apk", "-" + android.defaultConfig.versionName + "-" + getDate() + ".apk")
           // set different versionCodes for different ABIs
           int abiVersionCode = project.ext.versionCodes.get(output.getFilter(com.android.build.OutputFile.ABI)) ?: 0
-          output.versionCodeOverride = (abiVersionCode * 1000) + android.defaultConfig.versionCode
+          output.versionCodeOverride = (abiVersionCode * 1000) + variant.versionCode
         }
       }
     }