diff --git a/appveyor.yml b/appveyor.yml
index 6e57db92bf..8fa9a43ab7 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -21,10 +21,14 @@ before_deploy:
   - appveyor DownloadFile "http://downloads.sourceforge.net/project/nsis/NSIS 2/2.46/nsis-2.46-setup.exe" -FileName nsissetup.exe
   - nsissetup /S /D=%NSIS_ROOT%
   - appveyor DownloadFile "http://nsis.sourceforge.net/mediawiki/images/archive/1/18/20140806212030!NsProcess.zip" -FileName NsProcess.zip
-  - 7z e NsProcess.zip -o%NSIS_ROOT%
+  - 7z e NsProcess.zip -o%NSIS_ROOT% -y
   - appveyor DownloadFile "https://raw.githubusercontent.com/wiki/OpenRA/OpenRA/Changelog.md" -FileName Changelog.md
   - '%NSIS_ROOT%\makensis /DSRCDIR="%APPVEYOR_BUILD_FOLDER%" /DDEPSDIR="%APPVEYOR_BUILD_FOLDER%\thirdparty\windows" /V3 packaging/windows/OpenRA.nsi'
-  - appveyor PushArtifact packaging/windows/OpenRA.Setup.exe -FileName OpenRA-%APPVEYOR_REPO_TAG_NAME%.exe
+  - move packaging/windows/OpenRA.Setup.exe %APPVEYOR_BUILD_FOLDER%/OpenRA-%APPVEYOR_REPO_TAG_NAME%.exe
+
+artifacts:
+  - name: Installer
+    path: 'OpenRA-%APPVEYOR_REPO_TAG_NAME%.exe'
 
 deploy:
   - provider: GitHub
@@ -32,5 +36,4 @@ deploy:
       secure: Z7RC+ckfvf7Kxf2EdWZCP7bgGjRnhgbMeieQP6VVhiZprwvbEzGXI2Wma+FGAq65
     artifact: OpenRA-%APPVEYOR_REPO_TAG_NAME%.exe
     on:
-      branch: master
       appveyor_repo_tag: true