diff --git a/.circleci/config.yml b/.circleci/config.yml
index 97ba5337..b851b8a1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -227,6 +227,12 @@ jobs:
       - checkout
       - attach_workspace:
           at: ./dist
+      - run:
+          name: "Don't upload if it's not on a tag"
+          command: |
+            if [ -z `git tag -l --points-at master` ]; then
+              circleci-agent step halt
+            fi  
       - run:
           name: "Setup files for aws-s3"
           command: |
@@ -243,6 +249,12 @@ jobs:
       - checkout
       - attach_workspace:
           at: ./dist
+      - run:
+          name: "Don't upload if it's not on a tag"
+          command: |
+            if [ -z `git tag -l --points-at master` ]; then
+              circleci-agent step halt
+            fi  
       - run:
           name: "Setup files for ghr"
           command: |
@@ -273,13 +285,7 @@ workflows:
       - build-linux:
           requires:
             - check
-          filters:
-            branches:
-              only:
-                - /.*/
-            tags:
-              ignore:
-                - /.*/
+
       - build-win-no-installer:
           requires:
             - check
@@ -287,6 +293,7 @@ workflows:
             branches:
               ignore:
                 - /^release-\d+(\.\d+){1,2}(-rc.*)?/
+
       - build-mac-no-dmg:
           requires:
             - check
@@ -294,6 +301,7 @@ workflows:
             branches:
               ignore:
                 - /^release-\d+(\.\d+){1,2}(-rc.*)?/
+
       - msi_installer:
           requires:
             - check
@@ -305,6 +313,7 @@ workflows:
                 # release-XX.YY.ZZ
                 # release-XX.YY.ZZ-rc-something
                 - /^release-\d+(\.\d+){1,2}(-rc.*)?/
+
       - mac_installer:
           requires:
             - check
@@ -313,6 +322,7 @@ workflows:
             branches:
               only:
                 - /^release-\d+(\.\d+){1,2}(-rc.*)?/
+
       - store_artifacts:
           # for master/PR builds
           requires:
@@ -323,6 +333,7 @@ workflows:
             branches:
               ignore:
                 - /^release-\d+(\.\d+){1,2}(-rc.*)?/
+
       - upload_to_s3:
           # for release builds
           requires:
diff --git a/scripts/generate_release_markdown.sh b/scripts/generate_release_markdown.sh
index 6571ec7a..9600c488 100755
--- a/scripts/generate_release_markdown.sh
+++ b/scripts/generate_release_markdown.sh
@@ -22,8 +22,8 @@ Release notes can be found here: https://docs.mattermost.com/help/apps/desktop-c
 The download links can be found below.
 
 #### Windows - msi files (beta)
-$(print_link "${BASE_URL}/mattermost-desktop-v${VERSION}-x64.msi")
-$(print_link "${BASE_URL}/mattermost-desktop-v${VERSION}-x86.msi")
+$(print_link "${BASE_URL}/mattermost-desktop-${VERSION}-x64.msi")
+$(print_link "${BASE_URL}/mattermost-desktop-${VERSION}-x86.msi")
 
 #### Windows - setup exe files
 $(print_link "${BASE_URL}/mattermost-desktop-setup-${VERSION}-win.exe")