diff --git a/appveyor.yml b/appveyor.yml
index 0ffb680ff..63089da9d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,16 +1,8 @@
-# shallow clone
-clone_depth: 5
-
-environment:
-  BUILD_PASSWORD:
-    secure: EXGNlWKJsCtbeImEJ5EP9qrxZ+EqUFfNy+CP61nDOMA=
-
-cache:
-  - C:\ProgramData\chocolatey\bin -> appveyor.yml
-  - C:\ProgramData\chocolatey\lib -> appveyor.yml
-
+version: 0.0.{build}
 os: Visual Studio 2015
 
+clone_depth: 5
+
 platform:
   - x64
 
@@ -25,47 +17,25 @@ before_build:
   - cd build
   - cmake -G "Visual Studio 14 2015 Win64" -DCITRA_USE_BUNDLED_QT=1 -DCITRA_USE_BUNDLED_SDL2=1 ..
   - cd ..
+after_build:
+
+- cmd: 7z a release.7z C:\projects\citra-30v4x\build\bin\*
 
 build:
   project: build/citra.sln
   parallel: true
 
-test_script:
-  - cd build && ctest -VV -C Release && cd ..
 
-on_success:
-    # copying the needed QT Dlls is now done post build. See the CMakeLists.txt file in the citra-qt folder
-  - ps: >
-        if (!"$env:APPVEYOR_PULL_REQUEST_TITLE" -and ("$env:APPVEYOR_REPO_BRANCH" -eq "master"))
-          {
-            $GITDATE = $(git show -s --date=short --format='%ad') -replace "-",""
-            $GITREV = $(git show -s --format='%h')
-            # Where are these spaces coming from? Regardless, let's remove them
-            $BUILD_NAME = "citra-${GITDATE}-${GITREV}-windows-amd64.7z" -replace " ",""
-            $BUILD_NAME_PDB = "citra-${GITDATE}-${GITREV}-windows-amd64-debugsymbols.7z" -replace " ",""
-            $BUILD_NAME_NOQT = "citra-noqt-${GITDATE}-${GITREV}-windows-amd64.7z" -replace " ",""
+artifacts:
 
-            # Remove unnecessary files
-            rm .\build\bin\release\*tests*
+- path: release.7z
 
-            # Put the pdb files in a separate archive and remove them from the main download
-            7z a $BUILD_NAME_PDB .\build\bin\release\*.pdb
-            rm .\build\bin\release\*.pdb
+  name: release
 
-            # Zip up the build folder and documentation
-            7z a $BUILD_NAME .\build\bin\release\* .\license.txt .\README.md
-            # Do a second archive with only the binaries (excludes dlls) and documentation
-            7z a $BUILD_NAME_NOQT .\build\bin\release\*.exe .\license.txt .\README.md
+deploy:
+- provider: GitHub
+  auth_token:
+    secure: U0ksP/ootcmbZcebIK89O8CPgjsKAnDiFVKWA1qyqTyAAlvD/gJ7zIPiVCrppKkD
+  draft: true
+  prerelease: true
 
-
-            # Download WinSCP and upload to server
-            choco install winscp.portable
-            WinSCP.exe /command `
-                "option batch abort" `
-                "option confirm off" `
-                "open sftp://citra-builds:${env:BUILD_PASSWORD}@builds.citra-emu.org -hostkey=*" `
-                "put $BUILD_NAME /citra/nightly/windows-amd64/" `
-                "put $BUILD_NAME_NOQT /citra/nightly/windows-noqt-amd64/" `
-                "put $BUILD_NAME_PDB /citra/nightly/windows-amd64-debugsymbols/" `
-                "exit"
-          }