diff --git a/.vsts-ci.Windows.yml b/.vsts-ci.Windows.yml
index a1c635bc..6cc06371 100644
--- a/.vsts-ci.Windows.yml
+++ b/.vsts-ci.Windows.yml
@@ -75,7 +75,7 @@ jobs:
       msbuildLocationMethod: version
       msbuildVersion: latest
       msbuildArchitecture: x86
-      msbuildArguments: /r /p:Configuration=Release /detailedsummary
+      msbuildArguments: /r /p:Configuration=Release /detailedsummary /p:AndroidSigningKeyPass=$(KeystorePassword) /p:AndroidSigningStorePass=$(KeystorePassword) 
       clean: false
       maximumCpuCount: true
       restoreNugetPackages: false
diff --git a/src/Calculator.Droid/Calculator.Droid.csproj b/src/Calculator.Droid/Calculator.Droid.csproj
index 6f04ada4..0b7a3343 100644
--- a/src/Calculator.Droid/Calculator.Droid.csproj
+++ b/src/Calculator.Droid/Calculator.Droid.csproj
@@ -21,6 +21,9 @@
     <AndroidUseIntermediateDesignerFile>True</AndroidUseIntermediateDesignerFile>
     <ResourcesDirectory>..\Calculator.Shared\Strings</ResourcesDirectory>
     <LangVersion>7.3</LangVersion>
+    <AndroidKeyStore>true</AndroidKeyStore>
+    <AndroidSigningKeyStore>C:\s\nv.github\calculator-2\src\Calculator.Droid\calc-prod.keystore</AndroidSigningKeyStore>
+    <AndroidSigningKeyAlias>calc-prod</AndroidSigningKeyAlias>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -84,25 +87,25 @@
   <ItemGroup>
     <AndroidResource Include="Resources\values\Styles.xml" />
   </ItemGroup>
-	<ItemGroup>
-		<AndroidNativeLibrary Include="libs\ARM\$(Configuration)\libCalcManager.so">
-			<Abi>armeabi-v7a</Abi>
-		</AndroidNativeLibrary>
-		<AndroidNativeLibrary Include="libs\ARM64\$(Configuration)\libCalcManager.so">
-			<Abi>arm64-v8a</Abi>
-		</AndroidNativeLibrary>
-		<AndroidNativeLibrary Include="libs\x86\$(Configuration)\libCalcManager.so">
-			<Abi>x86</Abi>
-		</AndroidNativeLibrary>
-	</ItemGroup>
-	<Import Project="..\Calculator.Shared\Calculator.Shared.projitems" Label="Shared" Condition="Exists('..\Calculator.Shared\Calculator.Shared.projitems')" />
+  <ItemGroup>
+    <AndroidNativeLibrary Include="libs\ARM\$(Configuration)\libCalcManager.so">
+      <Abi>armeabi-v7a</Abi>
+    </AndroidNativeLibrary>
+    <AndroidNativeLibrary Include="libs\ARM64\$(Configuration)\libCalcManager.so">
+      <Abi>arm64-v8a</Abi>
+    </AndroidNativeLibrary>
+    <AndroidNativeLibrary Include="libs\x86\$(Configuration)\libCalcManager.so">
+      <Abi>x86</Abi>
+    </AndroidNativeLibrary>
+  </ItemGroup>
+  <Import Project="..\Calculator.Shared\Calculator.Shared.projitems" Label="Shared" Condition="Exists('..\Calculator.Shared\Calculator.Shared.projitems')" />
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
-	<Target Name="GenerateBuild" DependsOnTargets="SignAndroidPackage" AfterTargets="Build" Condition="'$(BuildingInsideVisualStudio)'==''" />
-	<!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+  <Target Name="GenerateBuild" DependsOnTargets="SignAndroidPackage" AfterTargets="Build" Condition="'$(BuildingInsideVisualStudio)'==''" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
      Other similar extension points exist, see Microsoft.Common.targets.
 		<Target Name="BeforeBuild">
 		</Target>
 		<Target Name="AfterBuild">
 		</Target>
  -->
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/Calculator.Droid/calc-prod.keystore b/src/Calculator.Droid/calc-prod.keystore
new file mode 100644
index 00000000..76862839
Binary files /dev/null and b/src/Calculator.Droid/calc-prod.keystore differ
diff --git a/src/Calculator.Droid/upload_certificate.pem b/src/Calculator.Droid/upload_certificate.pem
new file mode 100644
index 00000000..96843607
--- /dev/null
+++ b/src/Calculator.Droid/upload_certificate.pem
@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDcTCCAlmgAwIBAgIEY3shPzANBgkqhkiG9w0BAQsFADBpMRAwDgYDVQQGEwdV
+bmtub3duMRAwDgYDVQQIEwdVbmtub3duMRAwDgYDVQQHEwdVbmtub3duMRUwEwYD
+VQQKEwxVbm8gUGxhdGZvcm0xDDAKBgNVBAsTA1VubzEMMAoGA1UEAxMDVW5vMB4X
+DTE5MDUyNDE1MTMzM1oXDTQ2MTAwOTE1MTMzM1owaTEQMA4GA1UEBhMHVW5rbm93
+bjEQMA4GA1UECBMHVW5rbm93bjEQMA4GA1UEBxMHVW5rbm93bjEVMBMGA1UEChMM
+VW5vIFBsYXRmb3JtMQwwCgYDVQQLEwNVbm8xDDAKBgNVBAMTA1VubzCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAL9Cttd5kSkf1TuHlRl1AHNi3VrIa5qc
+JckPj0EbbE3qjkgeP380JZkRa3+BUG092yv6x5+a2QtFGs0slCzeJOcyfk0+jdw+
+wv1Gy1fZsdumsqNQDzWNFx7gUeJaejXeOrk7adrMkFd9bhSP1RFjFARdqO7DyO8o
+ntEYLKq9ojU7a9m/OlNT8Mcr9LDlrWuMPlsuuDxzDvrWPCnaXlLCYSMKcbU55pHo
+vRcBKs/LMsKS8nOdfJZQshEPMKIL+oRbDr51BUMUO/bGwWfKD6RedeG+rR5m9//M
+0VSSA2Gvhcs1cpiBmjVH1UXTMUUlsDLYZhA7GLn3K4SeLwk0tUrsqzsCAwEAAaMh
+MB8wHQYDVR0OBBYEFL0uatXCOU81LtLkt6nfiFH4asKRMA0GCSqGSIb3DQEBCwUA
+A4IBAQBnjujRS/RxrDJxZ7tsO1of6gRdXq+oJpiWAe/0UtfTvA9rV0Kheio/TDnv
+NQRzVRCuPmFcYdxrR/vSdG4LOFcfPS0fwerXc5We9NE3vJy1NckflQXbWpKjXjNY
+N10sjEqhvyNG/DmkRvNArG5hYBi8BMr41LQB3CmOV3aIehVFHdkEOYR/iYL8FZV7
+kKaPrSyY9rrLrsneZzDhnhRTlHHHT9JcRi1MqPo93z4Y9V2IfVE98Ei6zBi0n5gg
+KjmTwXDrmCOutS79HqYLl7Zpo5ObbV6kPFfrv0U+IxJf8nY/Wc3bj7unaHFNRn0p
+c+tC46FBqZ7gzJb6+yl+hMCsdMzT
+-----END CERTIFICATE-----