diff --git a/.travis.yml b/.travis.yml
index 6b5d07d..6919654 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,7 +28,7 @@ deploy:
   api_key:
     secure: m5ZWgdaBW7fCjP7eGh15E3uP0xkufPxi1MFifEAmjFjUm54d0yUhghoUxp/o9LUMrpRfveHyieJJzyBzCxr7ZhTs//4bPuQDpK7d1LMGobCvpnftwWRNG/cDBn57pc/Ixn9M0qPP8GAhTXg9hrmaUllRUOhUTxxlBB6Ew7ecEVMcqnZyYnTQTeaoYgiZENICpM43v9Pl7ew38qrEO4x6B3CqwGnYUEUuKxS/jRQBlbFQ7rdVj14AsJjDzI8WWuZfJwy21NtFqCnRnlObVY/YSEgSJgsD9JT6RSa7Q9AAAghVqFAv+kSf7vbpIdOIEWx4RSWAD1qFnPUsU+6/0QATbbt6s2McVRBBowQhwwg1nhWVkFDADV0fC9NgosVXsInqmk8ISHEvGa0tmG5gTnFVTcLtKlGJ2tsHMSQiOwqVaRxfui7NdoHIRhryP9DMlEGHMlsk82iSyM1cJXTeRewbXpIWPMY0yEG5VErC+v8uvfyt1LFqMMZvaGPjhrvup1zd0h3t699grAv+mFyq+RHYOMwn1SPLNdFt6LnUeam55ibBSijkhqGYWzY6LErdNmVNk81wUY9HksP1j0oKj9Xe3aLSclbsXv7UE0PruV2N762dykBloQYHl2s4zyt/wb/3tdF6uOhShwD5ZDs9Z73Op8q9wWFwE8v/4uZpCP/rTnw=
   file_glob: true
-  file: "artifacts/*"
+  file: "artifacts/*.7z"
   skip_cleanup: true
   draft: true
   on:
diff --git a/.travis/common/post-upload.sh b/.travis/common/post-upload.sh
index 164c729..7b3904d 100755
--- a/.travis/common/post-upload.sh
+++ b/.travis/common/post-upload.sh
@@ -7,17 +7,7 @@ cp README.md "$REV_NAME"
 cp dist/threeSDumper.gm9 "$REV_NAME/dist"
 
 tar $COMPRESSION_FLAGS "$ARCHIVE_NAME" "$REV_NAME"
-
-# Find out what release we are building
-if [ -z $TRAVIS_TAG ]; then
-    RELEASE_NAME=head
-else
-    RELEASE_NAME=$(echo $TRAVIS_TAG | cut -d- -f1)
-fi
-
-mv "$REV_NAME" $RELEASE_NAME
-
-7z a "$REV_NAME.7z" $RELEASE_NAME
+7z a "$REV_NAME.7z" $REV_NAME
 
 # move the compiled archive into the artifacts directory to be uploaded by travis releases
 mv "$ARCHIVE_NAME" artifacts/
diff --git a/.travis/linux/upload.sh b/.travis/linux/upload.sh
index a25e91e..18a48f1 100755
--- a/.travis/linux/upload.sh
+++ b/.travis/linux/upload.sh
@@ -2,7 +2,13 @@
 
 . .travis/common/pre-upload.sh
 
-REV_NAME="threeSD-linux-${GITDATE}-${GITREV}"
+# Find out what release we are building
+if [ -z $TRAVIS_TAG ]; then
+    REV_NAME="threeSD-linux-${GITDATE}-${GITREV}"
+else
+    REV_NAME="threeSD-linux-${TRAVIS_TAG}"
+fi
+
 ARCHIVE_NAME="${REV_NAME}.tar.xz"
 COMPRESSION_FLAGS="-cJvf"
 
diff --git a/.travis/macos/upload.sh b/.travis/macos/upload.sh
index af100fa..76e29c5 100755
--- a/.travis/macos/upload.sh
+++ b/.travis/macos/upload.sh
@@ -2,7 +2,13 @@
 
 . .travis/common/pre-upload.sh
 
-REV_NAME="threeSD-macos-${GITDATE}-${GITREV}"
+# Find out what release we are building
+if [ -z $TRAVIS_TAG ]; then
+    REV_NAME="threeSD-macos-${GITDATE}-${GITREV}"
+else
+    REV_NAME="threeSD-macos-${TRAVIS_TAG}"
+fi
+
 ARCHIVE_NAME="${REV_NAME}.tar.gz"
 COMPRESSION_FLAGS="-czvf"
 
diff --git a/appveyor.yml b/appveyor.yml
index 5f0e4b0..2b23012 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -74,7 +74,11 @@ after_build:
         $GITDATE = $(git show -s --date=short --format='%ad') -replace "-",""
         $GITREV = $(git show -s --format='%h')
 
-        $BUILD_SEVENZIP = "threeSD-windows-$GITDATE-$GITREV.7z" -replace " ", ""
+        if ($env:APPVEYOR_REPO_TAG_NAME) {
+          $BUILD_SEVENZIP = "threeSD-windows-$env:APPVEYOR_REPO_TAG_NAME.7z" -replace " ", ""
+        } else {
+          $BUILD_SEVENZIP = "threeSD-windows-$GITDATE-$GITREV.7z" -replace " ", ""
+        }
         $env:BUILD_SEVENZIP = $BUILD_SEVENZIP
 
         7z a $BUILD_SEVENZIP release
@@ -90,3 +94,5 @@ deploy:
     secure: 4xdt1ZdE/ZgP2amG5Jr073yvbitMmdV0ts48wKBKEWpR6PJwDG3bR0Attvm9Mgv8
   artifact: build
   draft: true
+  on:
+    branch: master