diff --git a/.vsts-ci.Windows.yml b/.vsts-ci.Windows.yml
index 8839f7c..09065aa 100644
--- a/.vsts-ci.Windows.yml
+++ b/.vsts-ci.Windows.yml
@@ -8,6 +8,7 @@ jobs:
     ANDROID_NDK_HOME: C:\Microsoft\AndroidNDK64\android-ndk-r16b
     ANDROID_NDK_PATH: C:\Microsoft\AndroidNDK64\android-ndk-r16b
     AndroidNdkDirectory: C:\Microsoft\AndroidNDK64\android-ndk-r16b
+    VersionCodeOffset: 400559 # last value for the APK release
 
   steps:
   - task: GitVersion@4
diff --git a/src/build/build.csproj b/src/build/build.csproj
index 4e4d2da..bc5117b 100644
--- a/src/build/build.csproj
+++ b/src/build/build.csproj
@@ -26,6 +26,7 @@
 		<PropertyGroup>
 			<_BuildNumber>$(_BuildNumber)</_BuildNumber>
 			<_BuildNumber Condition="'$(BUILD_REPOSITORY_PROVIDER)' == 'TfsVersionControl'">$(BUILD_SOURCEVERSION.Substring(1))</_BuildNumber>
+			<_VersionCode>$(_BuildNumber)</_VersionCode>
 		</PropertyGroup>
 
 		<Message Text="%0A#### Running BuildVersion"
@@ -40,6 +41,7 @@
 
 		<PropertyGroup>
 			<_BuildNumber Condition="$(BuildNumberOffset) != ''">$([MSBuild]::Add($(_BuildNumber), $(BuildNumberOffset)))</_BuildNumber>
+			<_VersionCode Condition="$(VersionCodeOffset) != ''">$([MSBuild]::Add($(_BuildNumber), $(VersionCodeOffset)))</_VersionCode>
 			<_InformationalVersion>$(PackageInformationalVersion)</_InformationalVersion>
 			<_InformationalVersion Condition="'$(_InformationalVersion)' == ''">$(GITVERSION_InformationalVersion)</_InformationalVersion>
 			<_AppVersion>$(_AppVersion)</_AppVersion>
@@ -127,7 +129,7 @@
 		</PropertyGroup>
 
 		<Message Text="Updating Package versions" />
-		<Message Text="_AppVersion: $(_AppVersion) _BuildNumber: $(_BuildNumber)" Importance="high" />
+		<Message Text="_AppVersion: $(_AppVersion) _BuildNumber: $(_BuildNumber) _VersionCode: $(_VersionCode)" Importance="high" />
 
 		<!-- Android -->
 		<XmlPoke Condition="Exists('$(_ManifestPath)')"
@@ -139,7 +141,7 @@
 		<XmlPoke Condition="Exists('$(_ManifestPath)')"
                      XmlInputPath="$(_ManifestPath)"
                      Query="/manifest/@android:versionCode"
-                     Value="$(_BuildNumber)"
+                     Value="$(_VersionCode)"
                      Namespaces="$(_AndroidNamespace)" />
 
 		<!-- iOS -->