diff --git a/.github/workflows/build-desktop.yml b/.github/workflows/build-desktop.yml
index 35e2f347..0ee768bb 100644
--- a/.github/workflows/build-desktop.yml
+++ b/.github/workflows/build-desktop.yml
@@ -4,12 +4,13 @@ on:
   push:
     branches:
       - master
-      - 'buildtest/**'
+      - "buildtest/**"
 
 jobs:
   build:
-    # if: "contains(github.event.head_commit.message, 'chore(release)') || contains(github.ref, 'buildtest')"
+    if: "contains(github.event.head_commit.message, 'chore(release)') || contains(github.ref, 'buildtest')"
     runs-on: ${{ matrix.os }}
+    continue-on-error: true
 
     strategy:
       matrix:
@@ -32,6 +33,8 @@ jobs:
         # if: contains(github.ref, "v0.")
         with:
           github_token: ${{ secrets.github_token }}
+          max_attempts: 2
+          build_script_name: "build:desktop"
           mac_certs: ${{ secrets.mac_certs }}
           mac_certs_password: ${{ secrets.mac_certs_password }}
           release: true
@@ -39,3 +42,9 @@ jobs:
           # macOS notarization API key
           API_KEY_ID: ${{ secrets.api_key_id }}
           API_KEY_ISSUER_ID: ${{ secrets.api_key_issuer_id }}
+      - name: Upload Artifacts
+        if: "contains(github.ref, 'buildtest')"
+        uses: actions/upload-artifact@v2
+        with:
+          name: ${{matrix.os}}.dist
+          path: dist
diff --git a/package.json b/package.json
index dc1b8847..a3599090 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
     "build:vanilla": "parcel build -d ./lib -o vanilla.js ./src/vanilla/index.js",
     "build:vanilla:dev": "parcel ./src/vanilla/index.js",
     "build:web": "rimraf build && react-scripts build && cp -r build ./build-copy && mv build-copy build/app",
-    "build:desktop": "cross-env REACT_APP_DESKTOP=true PUBLIC_URL=. react-scripts build && electron-builder build && cp ./desktop/entitlements.mac.plist ./build/entitlements.mac.plist",
+    "build:desktop": "cross-env REACT_APP_DESKTOP=true PUBLIC_URL=./ react-scripts build && electron-builder build && cp ./desktop/entitlements.mac.plist ./build/entitlements.mac.plist",
     "start:desktop": "cross-env BROWSER=none USE_DEV_SERVER=yes concurrently 'npm run start' 'electron ./desktop'",
     "start:desktop:build": "electron ./desktop",
     "postinstall:desktop": "electron-builder install-app-deps",