diff --git a/appveyor.yml b/appveyor.yml
index 3f0d5de9d..55d390f9b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,5 +1,10 @@
+init:
+  - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
 install:
   - appveyor DownloadFile https://dist.nuget.org/win-x86-commandline/latest/nuget.exe
+  - appveyor DownloadFile https://aka.ms/vs/15/release/vs_community.exe
+  - vs_community.exe --update --quiet --wait
+  - vs_community.exe update --wait --passive --norestart --installPath "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community"
 before_build:
   - nuget restore
   - IF DEFINED keystore_dec_secret nuget install secure-file -ExcludeVersion
@@ -9,6 +14,8 @@ after_build:
 on_success:
   - IF DEFINED play_dec_secret secure-file\tools\secure-file -decrypt store\google\Publisher\play_creds.json.enc -secret %play_dec_secret%
   - IF DEFINED play_dec_secret dotnet store\google\Publisher\bin\Release\netcoreapp2.0\Publisher.dll %APPVEYOR_BUILD_FOLDER%\store\google\Publisher\play_creds.json %APPVEYOR_BUILD_FOLDER%\com.x8bit.bitwarden-%APPVEYOR_BUILD_NUMBER%.apk alpha
+on_finish:
+  - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
 artifacts:
   - path: com.x8bit.bitwarden-%APPVEYOR_BUILD_NUMBER%.apk
   - path: com.x8bit.bitwarden-fdroid-%APPVEYOR_BUILD_NUMBER%.apk
@@ -17,4 +24,4 @@ branches:
     - l10n_master
 skip_tags: true
 configuration: Release
-image: Previous Visual Studio 2017
+image: Visual Studio 2017