diff --git a/appveyor.yml b/appveyor.yml
index 052880c3..df1595a9 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -86,11 +86,11 @@ after_build:
   - ps: Get-ChildItem -Include sqlite3.dll -Recurse | Remove-Item -Force
   - ps: Get-ChildItem -Include _sqlite3.pyd -Recurse | Remove-Item -Force
   # Create zip for deployment
-  - 7z a yubioath-desktop-%APPVEYOR_REPO_BRANCH%-win.zip .\release\*
+  - 7z a yubioath-desktop-%APPVEYOR_REPO_BRANCH%%APPVEYOR_REPO_TAG_NAME%-win.zip .\release\*
   - cd %APPVEYOR_BUILD_FOLDER%
 
 artifacts:
-  - path: yubioath-desktop-%APPVEYOR_REPO_BRANCH%-win.zip
+  - path: yubioath-desktop-%APPVEYOR_REPO_BRANCH%%APPVEYOR_REPO_TAG_NAME%-win.zip
 
 deploy:
   - provider: S3