diff --git a/.github/workflows/build-and-sign.yml b/.github/workflows/build-and-sign.yml
index c97c29e344..fc29cf2670 100644
--- a/.github/workflows/build-and-sign.yml
+++ b/.github/workflows/build-and-sign.yml
@@ -101,14 +101,14 @@ jobs:
         #if: github.ref == 'refs/heads/master' || github.event_name == 'release'
         uses: actions/upload-artifact@v2
         with:
-          name: Bitwarden-${{ env.PACKAGE_VERSION }}-ia32-signed.appx
+          name: Bitwarden-${{ env.PACKAGE_VERSION }}-ia32.appx
           path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-ia32.appx
 
       - name: Upload signed appx x64 artifact
         #if: github.ref == 'refs/heads/master' || github.event_name == 'release'
         uses: actions/upload-artifact@v2
         with:
-          name: Bitwarden-${{ env.PACKAGE_VERSION }}-x64-signed.appx
+          name: Bitwarden-${{ env.PACKAGE_VERSION }}-x64.appx
           path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-x64.appx
 
 #- name: Upload release assets
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8d8d61aa24..78e85b11bc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,13 +1,16 @@
 name: Build
 
-on:
-  push:
-    branches-ignore:
-      - 'l10n_master'
-      - 'gh-pages'
-  release:
-    types:
-      - published
+on: 
+  workflow_dispatch:
+    
+# on:
+#   push:
+#     branches-ignore:
+#       - 'l10n_master'
+#       - 'gh-pages'
+#   release:
+#     types:
+#       - published
 
 jobs:
 
@@ -170,28 +173,28 @@ jobs:
             -Destination "./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-x64-store.appx"
 
       - name: Upload portable exe artifact
-        if: github.ref == 'refs/heads/master' || github.event_name == 'release'
+        #if: github.ref == 'refs/heads/master' || github.event_name == 'release'
         uses: actions/upload-artifact@v2
         with:
           name: Bitwarden-Portable-${{ env.PACKAGE_VERSION }}.exe
           path: ./dist/Bitwarden-Portable-${{ env.PACKAGE_VERSION }}.exe
 
       - name: Upload installer exe artifact
-        if: github.ref == 'refs/heads/master' || github.event_name == 'release'
+        #if: github.ref == 'refs/heads/master' || github.event_name == 'release'
         uses: actions/upload-artifact@v2
         with:
           name: Bitwarden-Installer-${{ env.PACKAGE_VERSION }}.exe
           path: ./dist/nsis-web/Bitwarden-Installer-${{ env.PACKAGE_VERSION }}.exe
 
       - name: Upload store appx ia32 artifact
-        if: github.ref == 'refs/heads/master' || github.event_name == 'release'
+        #if: github.ref == 'refs/heads/master' || github.event_name == 'release'
         uses: actions/upload-artifact@v2
         with:
           name: Bitwarden-${{ env.PACKAGE_VERSION }}-ia32-store.appx
           path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-ia32-store.appx
 
       - name: Upload store appx x64 artifact
-        if: github.ref == 'refs/heads/master' || github.event_name == 'release'
+        #if: github.ref == 'refs/heads/master' || github.event_name == 'release'
         uses: actions/upload-artifact@v2
         with:
           name: Bitwarden-${{ env.PACKAGE_VERSION }}-x64-store.appx
@@ -209,18 +212,18 @@ jobs:
       #     name: bitwarden.${{ env.PACKAGE_VERSION }}.nupkg
       #     path: ./dist/chocolatey/bitwarden.${{ env.PACKAGE_VERSION }}.nupkg
 
-      - name: Upload release assets
-        if: github.event_name == 'release'
-        run: |
-          hub release edit `
-            -a ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-ia32-store.appx `
-            -a ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-x64-store.appx `
-            -m "$($env:RELEASE_TAG_NAME.TrimStart('v'))" `
-            $env:RELEASE_TAG_NAME
-        shell: pwsh
-        env:
-          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
-          RELEASE_TAG_NAME: ${{ github.event.release.tag_name }}
+      #- name: Upload release assets
+      #  if: github.event_name == 'release'
+      #  run: |
+      #    hub release edit `
+      #      -a ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-ia32-store.appx `
+      #      -a ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-x64-store.appx `
+      #      -m "$($env:RELEASE_TAG_NAME.TrimStart('v'))" `
+      #      $env:RELEASE_TAG_NAME
+      #  shell: pwsh
+      #  env:
+      #    GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+      #    RELEASE_TAG_NAME: ${{ github.event.release.tag_name }}
 
   macos:
     runs-on: macos-latest