diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ef8ce6dc5b..c68ebeb2cd 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -76,9 +76,22 @@ jobs:
             npm run build
           }
 
+      - name: Compile artifacts
+        shell: bash
+        run: |
+          mkdir -p artifacts
+          if [ "$RUNNER_OS" == "Linux" ];then
+            cp ./dist/*.{snap,AppImage,deb,rpm,freebsd} ./artifacts
+          elif [ "$RUNNER_OS" == "Windows ]; then
+            cp ./dist/Bitwarden-*-x64.appx ./artifacts/Bitwarden-$PACKAGE_VERSION-x64-store.appx
+            cp ./dist/Bitwarden-*-ia32.appx ./artifacts/Bitwarden-$PACKAGE_VERSION-ia32-store.appx
+            cp ./dist/Bitwarden-Portable-*.exe ./artifacts
+            cp ./dist/nsis-web/Bitwarden-Installer-*.exe ./artifacts
+          fi
+
       - name: Upload artifacts
         if: runner.os == 'Linux' || runner.os == 'Windows'
         uses: actions/upload-artifact@v2-preview
         with:
-          name: dist
-          path: dist/*
+          name: artifacts
+          path: artifacts/*