diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 22f58355c9..7e7cce3904 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -37,6 +37,7 @@ jobs:
 
   linux:
     runs-on: ubuntu-latest
+    if: false
     needs: setup
     steps:
       - name: Set up Node
@@ -92,9 +93,8 @@ jobs:
           #snapcraft logout
 
 
-  windows:
+  windows-signed:
     runs-on: windows-latest
-    if: false
     needs: setup
     steps:
       - name: Set up dotnet
@@ -135,9 +135,9 @@ jobs:
         shell: pwsh
         run: |
           choco install checksum --no-progress
-          choco apikey --key $env:CHOCO_API_KEY --source https://push.chocolatey.org/
-        env:
-          CHOCO_API_KEY: ${{ secrets.CHOCO_API_KEY }}
+        #  choco apikey --key $env:CHOCO_API_KEY --source https://push.chocolatey.org/
+        #env:
+        #  CHOCO_API_KEY: ${{ secrets.CHOCO_API_KEY }}
 
       - name: Print environment
         run: |
@@ -169,14 +169,6 @@ jobs:
           SIGNING_CERT_NAME: ${{ secrets.SIGNING_CERT_NAME }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Rename appx files for store
-        shell: pwsh
-        run: |
-          Copy-Item "./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-ia32.appx" `
-            -Destination "./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-ia32-store.appx"
-          Copy-Item "./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-x64.appx" `
-            -Destination "./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-x64-store.appx"
-
       - name: Deploy to Chocolatey
         shell: pwsh
         run: |
@@ -188,10 +180,9 @@ jobs:
           (Get-Content $chocoInstall).replace('__version__', "$env:PACKAGE_VERSION").replace('__checksum__', $checksum) | Set-Content $chocoInstall
           choco pack ./dist/chocolatey/bitwarden.nuspec --version "$env:PACKAGE_VERSION" --out ./dist/chocolatey
           cd ./dist/chocolatey
-          choco push
+          #choco push
 
       - name: Upload Chocolatey nupkg release asset
-        id: upload-macos-checksum
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -202,6 +193,66 @@ jobs:
           asset_content_type: application
 
 
+  windows-store:
+    runs-on: windows-latest
+    needs: setup
+    steps:
+      - name: Set up Node
+        uses: actions/setup-node@v1
+        with:
+          node-version: '10.x'
+
+      - name: Set Node options
+        run: echo "NODE_OPTIONS=--max_old_space_size=4096" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+        shell: pwsh
+
+      - name: Set up environment
+        shell: pwsh
+        run: |
+          choco install checksum --no-progress
+
+      - name: Print environment
+        run: |
+          node --version
+          npm --version
+          choco --version
+
+      - name: Checkout repo
+        uses: actions/checkout@v2
+
+      - name: Load package version
+        run: ./.github/scripts/load-version.ps1
+        shell: pwsh
+
+      - name: Install Node dependencies
+        run: npm install
+
+      - name: Run linter
+        run: npm run lint
+
+      - name: Build, Sign & Release
+        run: npm run dist:win:ci
+
+      - name: Upload unsigned ia32 Windows Store release asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ needs.setup.outputs.release_upload_url }}
+          asset_name: Bitwarden-${{ env.PACKAGE_VERSION }}-ia32-store.appx
+          asset_path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-ia32.appx
+          asset_content_type: application
+
+      - name: Upload unsigned x64 Windows Store release asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ needs.setup.outputs.release_upload_url }}
+          asset_name: Bitwarden-${{ env.PACKAGE_VERSION }}-x64-store.appx
+          asset_path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-x64.appx
+          asset_content_type: application
+
   macos:
     runs-on: macos-latest
     if: false
diff --git a/sign.js b/sign.js
index 107f048d46..9f8277c02f 100644
--- a/sign.js
+++ b/sign.js
@@ -1,8 +1,7 @@
 exports.default = async function(configuration) {
   if (
     parseInt(process.env.ELECTRON_BUILDER_SIGN) === 1 && 
-    configuration.path.slice(-4) == ".exe" &&
-    !(configuration.path.includes('win-unpacked') || configuration.path.includes('win-ia32-unpacked'))
+    configuration.path.slice(-4) == ".exe"
   ) {
     console.log(`[*] Signing file: ${configuration.path}`)
     require("child_process").execSync(
diff --git a/src/package.json b/src/package.json
index 0418f16b5a..4d7b5c9060 100644
--- a/src/package.json
+++ b/src/package.json
@@ -2,7 +2,7 @@
   "name": "bitwarden",
   "productName": "Bitwarden",
   "description": "A secure and free password manager for all of your devices.",
-  "version": "1.24.1",
+  "version": "1.24.2-alpha",
   "author": "Bitwarden Inc. <hello@bitwarden.com> (https://bitwarden.com)",
   "homepage": "https://bitwarden.com",
   "license": "GPL-3.0",