diff --git a/increment_version.sh b/increment_version.sh
index 1d4291dc5d..b72f159d0b 100755
--- a/increment_version.sh
+++ b/increment_version.sh
@@ -23,6 +23,8 @@ fi
 if [ "$1" = "test" ]; then
     release_type="test"
     previousTestVersionCode="$2"
+    # Remove last digit for internal version codes without split ABI
+    previousTestVersionCode=`echo "$previousTestVersionCode" | sed 's|[0-9]$||'`
 else
     release_type="normal"
 fi
@@ -91,8 +93,9 @@ if [ "$release_type" = "test" ]; then
 else
     versionCode=$((previousVersionCode + 10))
     # Ensure the new version code is higher than the one of the last test version
+    # Note that `versionCode` from build.gradle is before multiplying with 10 for split ABI, so here we remove the last digit
     if [ -f "$HOME/fdroid/sm/data/metadata/de.spiritcroc.riotx.x.yml" ]; then
-        lastTestVersionCode="$(cat "$HOME/fdroid/sm/data/metadata/de.spiritcroc.riotx.x.yml"|grep versionCode|tail -n 1|sed 's|.*: ||')"
+        lastTestVersionCode="$(cat "$HOME/fdroid/sm/data/metadata/de.spiritcroc.riotx.x.yml"|grep versionCode|tail -n 1|sed 's|.*: ||;s|[0-9]$||')"
     else
         read -p "Enter versionCode of last test version: " lastTestVersionCode
     fi
@@ -111,7 +114,8 @@ fi
 new_tag="sc_v$version"
 
 if ((preview)); then
-    echo "versionCode $versionCode"
+    # Append 0 for universal apk
+    echo "versionCode ${versionCode}0"
     echo "versionName $version"
     exit 0
 fi
diff --git a/vector-app/build.gradle b/vector-app/build.gradle
index 61439309c3..7e4147045f 100644
--- a/vector-app/build.gradle
+++ b/vector-app/build.gradle
@@ -156,7 +156,7 @@ android {
         renderscriptTargetApi 24
         renderscriptSupportModeEnabled true
 
-        versionCode 40101090
+        versionCode 4010110
         versionName "1.6.3.sc69"
 
         // Generate a random app task affinity
@@ -194,7 +194,6 @@ android {
             }
         }
 
-        /*
         applicationVariants.all { variant ->
             // assign different version code for each output
             def baseVariantVersion = variant.versionCode * 10
@@ -207,7 +206,6 @@ android {
                 output.outputFileName = output.outputFileName.replace("vector-app", "vector")
             }
         }
-        */
 
         // The following argument makes the Android Test Orchestrator run its
         // "pm clear" command after each test invocation. This command ensures