diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 75751a0..714e726 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,7 +13,7 @@ jobs:
         runs-on: ubuntu-latest
         env:
             RELEASE: ${{ github.event.release.name }}
-            RELEASE_ZIP: kittycad_diff-viewer_${{ github.event.release.name }}.zip
+            RELEASE_ZIP: kittycad_diff-viewer_${{ github.event.release.name || github.sha }}.zip
 
         steps:
             - uses: actions/checkout@v3.5.2
@@ -53,20 +53,23 @@ jobs:
                   yarn playwright install chromium --with-deps
                   yarn playwright test
 
+            - name: Create release zip
+              run: |
+                  cd build
+                  zip -r ../$RELEASE_ZIP *
+                  cd ..
+                  unzip -l $RELEASE_ZIP
+
             - uses: actions/upload-artifact@v3
               with:
-                  path: build
-
-            - name: Create release zip
-              if: github.event_name == 'release'
-              run: |
-                  zip -r $RELEASE_ZIP build/
+                  path: ${{ env.RELEASE_ZIP }}
+                  name: ${{ env.RELEASE_ZIP }}
 
             - name: Upload zip to release
               if: github.event_name == 'release'
               uses: svenstaro/upload-release-action@v2
               with:
-                  file: $RELEASE_ZIP
+                  file: ${{ env.RELEASE_ZIP }}
 
             - name: Upload zip to Chrome Web Store
               if: github.event_name == 'release'
@@ -77,4 +80,4 @@ jobs:
                   client_secret: ${{ secrets.CHROME_WEBSTORE_CLIENT_SECRET }}
                   refresh_token: ${{ secrets.CHROME_WEBSTORE_REFRESH_TOKEN }}
                   extension_id: gccpihmphokfjpohkmkbimnhhnlpmegp
-                  zip_file: $RELEASE_ZIP
+                  zip_file: ${{ env.RELEASE_ZIP }}