diff --git a/.appveyor.yml b/.appveyor.yml
index d42506119..603687691 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -30,6 +30,12 @@ init:
       If (-Not $env:APPVEYOR_PULL_REQUEST_NUMBER) {
         $env:is_not_pr = "true"
       }
+      If (-Not $env:APPVEYOR_REPO_COMMIT_MESSAGE) {
+        $env:APPVEYOR_REPO_COMMIT_MESSAGE = ""
+      }
+      If (-Not $env:APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED) {
+        $env:APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED = ""
+      }
 
 install:
   - |
@@ -79,10 +85,10 @@ deploy:
     repository: xenia-project/release-builds-windows
     auth_token:
       secure: /8he47z1WnPN7LcCTe5T5KMxxX0SmqFj9QMpeWEa3aZ64kMsfupOT/jKakqTM8af
-    tag: xenia-$(appveyor_repo_branch)-v$(appveyor_build_version)
-    release: xenia-$(appveyor_repo_branch)-v$(appveyor_build_version)
+    tag: v$(appveyor_build_version)
+    release: v$(appveyor_build_version)
     description: |
-      Windows release build for https://github.com/xenia-project/xenia/commit/$(APPVEYOR_REPO_COMMIT)
+      Windows release build for https://github.com/xenia-project/xenia/commit/$(APPVEYOR_REPO_COMMIT).
       
       $(APPVEYOR_REPO_COMMIT_MESSAGE)
       $(APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED)