diff --git a/vector/build.gradle b/vector/build.gradle
index 35d9d141..60a4542d 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -71,9 +71,7 @@ android {
         targetSdkVersion 28
         multiDexEnabled true
 
-        // For release, use generateVersionCodeFromVersionName()
-        versionCode generateVersionCodeFromTimestamp()
-        //versionCode generateVersionCodeFromVersionName()
+        // Note: versionCode is depending on the build variant
 
         versionName "${versionMajor}.${versionMinor}.${versionPatch}-dev"
 
@@ -117,9 +115,10 @@ android {
             }
         }
 
-        android.applicationVariants.all { variant ->
+        applicationVariants.all { variant ->
             variant.outputs.each { output ->
                 def baseAbiVersionCode = project.ext.abiVersionCodes.get(output.getFilter(OutputFile.ABI))
+                // Known limitation: it does not modify the value in the BuildConfig.java generated file
                 output.versionCodeOverride = baseAbiVersionCode * 10_000_000 + variant.versionCode
             }
         }
@@ -162,6 +161,8 @@ android {
         gplay {
             dimension "store"
 
+            versionCode = generateVersionCodeFromVersionName()
+
             buildConfigField "boolean", "ALLOW_FCM_USE", "true"
             buildConfigField "String", "SHORT_FLAVOR_DESCRIPTION", "\"G\""
             buildConfigField "String", "FLAVOR_DESCRIPTION", "\"GooglePlay\""
@@ -170,6 +171,8 @@ android {
         fdroid {
             dimension "store"
 
+            versionCode = generateVersionCodeFromTimestamp()
+
             buildConfigField "boolean", "ALLOW_FCM_USE", "false"
             buildConfigField "String", "SHORT_FLAVOR_DESCRIPTION", "\"F\""
             buildConfigField "String", "FLAVOR_DESCRIPTION", "\"FDroid\""