diff --git a/appveyor.yml b/appveyor.yml
index 314faa617a..69bc762f4c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,6 +1,6 @@
 clone_depth: 1
 version: '{branch}-{build}'
-image: Visual Studio 2017 preview
+image: Visual Studio 2017
 configuration: Debug
 cache:
   - C:\ProgramData\chocolatey\bin -> appveyor.yml
diff --git a/appveyor_deploy.yml b/appveyor_deploy.yml
index cadebd9d11..64ad927574 100644
--- a/appveyor_deploy.yml
+++ b/appveyor_deploy.yml
@@ -1,29 +1,26 @@
-branches:
-  only:
-  - release
-skip_tags: true
-skip_branch_with_pr: true
 clone_depth: 1
-version: '{branch}-{build}'
+version: '{build}'
+skip_non_tags: true
 image: Visual Studio 2017
-configuration: Debug
 cache:
-  - packages -> **\packages.config
+  - '%USERPROFILE%\.nuget\packages -> **\*.csproj'
 install:
-  - cmd: git submodule update --init --recursive --depth=5
+  - git clone https://github.com/ppy/osu-deploy
 before_build:
+  - ps: if($env:appveyor_repo_tag -eq 'True') { Update-AppveyorBuild -Version $env:appveyor_repo_tag_name }
+  - cmd: git submodule update --init --recursive --depth=5
   - cmd: nuget restore -verbosity quiet
-build:
-  project: osu.Desktop.Deploy/osu.Desktop.Deploy.csproj
-  verbosity: minimal
-after_build:
+build_script:
   - ps: iex ((New-Object Net.WebClient).DownloadString('https://raw.githubusercontent.com/appveyor/secure-file/master/install.ps1'))
   - appveyor DownloadFile https://puu.sh/A6g5K/4d08705438.enc # signing certificate
   - cmd: appveyor-tools\secure-file -decrypt 4d08705438.enc -secret %decode_secret% -out %HOMEPATH%\deanherbert.pfx
   - appveyor DownloadFile https://puu.sh/A6g75/fdc6f19b04.enc # deploy configuration
-  - cmd: appveyor-tools\secure-file -decrypt fdc6f19b04.enc -secret %decode_secret% -out osu.Desktop.Deploy\bin\Debug\net471\osu.Desktop.Deploy.exe.config
-  - cd osu.Desktop.Deploy\bin\Debug\net471\
-  - osu.Desktop.Deploy.exe %code_signing_password%
+  - cd osu-deploy
+  - nuget restore -verbosity quiet
+  - msbuild osu.Desktop.Deploy.csproj
+  - cmd: ..\appveyor-tools\secure-file -decrypt ..\fdc6f19b04.enc -secret %decode_secret% -out bin\Debug\net471\osu.Desktop.Deploy.exe.config
+  - cd bin\Debug\net471\
+  - osu.Desktop.Deploy.exe %code_signing_password% %APPVEYOR_REPO_TAG_NAME%
 environment:
   TargetFramework: net471
   decode_secret:
@@ -31,4 +28,7 @@ environment:
   code_signing_password:
     secure: 34tLNqvjmmZEi97MLKfrnQ==
 artifacts:
-  - path: 'Releases\*'
\ No newline at end of file
+  - path: 'Releases\*'
+deploy:
+  - provider: Environment
+    name: github
\ No newline at end of file