diff --git a/GUT.Schedule/GUT.Schedule.sln b/GUT.Schedule/GUT.Schedule.sln
index 056c894..4281a71 100644
--- a/GUT.Schedule/GUT.Schedule.sln
+++ b/GUT.Schedule/GUT.Schedule.sln
@@ -8,12 +8,16 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Release (APK)|Any CPU = Release (APK)|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{A0471165-37F5-4309-8A92-42F1A6589EEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A0471165-37F5-4309-8A92-42F1A6589EEE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A0471165-37F5-4309-8A92-42F1A6589EEE}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{A0471165-37F5-4309-8A92-42F1A6589EEE}.Release (APK)|Any CPU.ActiveCfg = Release|Any CPU
+		{A0471165-37F5-4309-8A92-42F1A6589EEE}.Release (APK)|Any CPU.Build.0 = Release|Any CPU
+		{A0471165-37F5-4309-8A92-42F1A6589EEE}.Release (APK)|Any CPU.Deploy.0 = Release|Any CPU
 		{A0471165-37F5-4309-8A92-42F1A6589EEE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A0471165-37F5-4309-8A92-42F1A6589EEE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A0471165-37F5-4309-8A92-42F1A6589EEE}.Release|Any CPU.Deploy.0 = Release|Any CPU
diff --git a/GUT.Schedule/GUT.Schedule/GUT.Schedule.csproj b/GUT.Schedule/GUT.Schedule/GUT.Schedule.csproj
index de85ea1..0e14128 100644
--- a/GUT.Schedule/GUT.Schedule/GUT.Schedule.csproj
+++ b/GUT.Schedule/GUT.Schedule/GUT.Schedule.csproj
@@ -58,6 +58,25 @@
     <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
     <BundleAssemblies>false</BundleAssemblies>
     <AndroidSupportedAbis>armeabi-v7a;x86;x86_64;arm64-v8a</AndroidSupportedAbis>
+    <AndroidPackageFormat>aab</AndroidPackageFormat>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release %28APK%29|AnyCPU'">
+    <OutputPath>bin\Release %28APK%29\</OutputPath>
+    <DebugSymbols>false</DebugSymbols>
+    <DebugType>portable</DebugType>
+    <Optimize>True</Optimize>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AndroidManagedSymbols>true</AndroidManagedSymbols>
+    <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
+    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
+    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
+    <AotAssemblies>false</AotAssemblies>
+    <EnableLLVM>false</EnableLLVM>
+    <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
+    <BundleAssemblies>false</BundleAssemblies>
+    <AndroidSupportedAbis>armeabi-v7a;x86;x86_64;arm64-v8a</AndroidSupportedAbis>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index d892aa7..dcdeef5 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -12,27 +12,43 @@ variables:
 
 steps:
 - task: NuGetToolInstaller@1
+  displayName: 'Install NuGet Tool'
 
 - task: NuGetCommand@2
+  displayName: 'Restore Solution'
   inputs:
     restoreSolution: '**/*.sln'
 
 - task: ResharperCli@2
+  displayName: 'RESharper CLI Code Analyzer'
   inputs:
     solutionOrProjectPath: 'GUT.Schedule/GUT.Schedule.sln'
     failBuildLevelSelector: 'Error'
     failBuildOnCodeIssues: false
 
 - task: XamarinAndroid@1
+  displayName: 'Build Solution (AppBundle)'
   inputs:
     projectFile: '**/**.csproj'
     outputDirectory: '$(outputDirectory)'
     configuration: '$(buildConfiguration)'
     msbuildVersionOption: 'latest'
     msbuildArchitectureOption: 'x64'
+    msbuildArguments: ' /t:PackageForAndroid -t:SignAndroidPackage -p:AndroidPackageFormat=aab /p:Configuration=Release'
+    jdkOption: 'JDKVersion'
+
+- task: XamarinAndroid@1
+  displayName: 'Build Solution (APK)'
+  inputs:
+    projectFile: '**/**.csproj'
+    outputDirectory: '$(outputDirectory)'
+    configuration: 'Release (APK)'
+    msbuildVersionOption: 'latest'
+    msbuildArchitectureOption: 'x64'
     jdkOption: 'JDKVersion'
 
 - task: DeleteFiles@1
+  displayName: 'Delete debug files'
   inputs:
     SourceFolder: '$(outputDirectory)'
     Contents: |
@@ -40,12 +56,21 @@ steps:
       **/**.dll
 
 - task: CopyFiles@2
+  displayName: 'Copy changelog to output'
   inputs:
     SourceFolder: '$(Build.SourcesDirectory)'
     Contents: 'changelog.md'
     TargetFolder: '$(outputDirectory)'
 
+- task: PowerShell@2
+  displayName: 'Update package name'
+  inputs:
+    targetType: 'inline'
+    script: 'get-childitem *-Signed.* | foreach { rename-item $_ $_.Name.Replace("-Signed", "") }'
+    workingDirectory: '$(outputDirectory)'
+
 - task: PublishBuildArtifacts@1
+  displayName: 'Drop Artifact'
   inputs:
     PathtoPublish: '$(outputDirectory)'
     ArtifactName: 'bundle'