diff --git a/.github/workflows/build-extension.yml b/.github/workflows/build-extension.yml
index 72579d29..b0643499 100644
--- a/.github/workflows/build-extension.yml
+++ b/.github/workflows/build-extension.yml
@@ -10,7 +10,7 @@ env:
   WALLET_ENVIRONMENT: feature
 
 jobs:
-  pre_run:
+  pre-run:
     runs-on: ubuntu-latest
     steps:
       - name: Cancel Previous Runs
@@ -21,21 +21,21 @@ jobs:
   update-pull-request-body:
     name: Add links to built extensions
     # Don't run on forks
-    if: github.repository == 'hirosystems/wallet'
+    if: github.repository == 'hirosystems/wallet' || github.repository == 'hirosystems/wallet-private'
     runs-on: ubuntu-latest
     needs:
-      - pre_run
+      - pre-run
     steps:
       - uses: kyranjamie/pull-request-fixed-header@v1.0.1
         with:
-          header: '> Try out this version of the Hiro Wallet - download [extension builds](https://github.com/hirosystems/wallet/actions/runs/${{ github.run_id }}).'
+          header: '> Try out this version of the Hiro Wallet - download [extension builds](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}).'
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   build_chrome_extension:
-    name: Build Chrome extension
+    name: Build debug Chrome extension
     runs-on: ubuntu-latest
     needs:
-      - pre_run
+      - pre-run
     steps:
       - uses: actions/checkout@v3
 
@@ -63,34 +63,29 @@ jobs:
           name: stacks-wallet-chromium
           path: stacks-wallet-chromium.zip
 
-  publish_firefox_beta:
-    name: Publish beta firefox extension
+  build_firefox:
+    name: Build debug Firefox extension
     runs-on: ubuntu-latest
     needs:
-      - pre_run
+      - pre-run
     env:
       MINIFY_PRODUCTION_BUILD: true
-    # Disabled as this job isn't running correctly
-    if: false
+      TARGET_BROWSER: firefox
     steps:
       - name: Checkout
         uses: actions/checkout@v3
         with:
           ref: ${{ github.event.pull_request.head.ref }}
 
-      - name: Set Node Version
-        uses: actions/setup-node@v3
-
-      - name: Restore cache
-        uses: actions/cache@v3
+      - uses: actions/cache@v3
+        id: cache-node-modules
         with:
-          path: |
-            node_modules
-            */*/node_modules
-          key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
+          path: '**/node_modules'
+          key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}-${{ hashFiles('**/package.json') }}
 
-      - name: Install yarn dependencies
-        run: PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1 yarn --frozen-lockfile
+      - name: Install packages
+        uses: ./.github/actions/provision
+        if: steps.cache-node-modules.outputs.cache-hit != 'true'
 
       - name: Build project
         run: yarn build
@@ -98,14 +93,10 @@ jobs:
       - name: Build extension
         run: sh build-ext.sh
 
-      - name: Sign Firefox extension
-        run: yarn web-ext sign --channel=unlisted
-        env:
-          WEB_EXT_API_KEY: ${{ secrets.WEB_EXT_API_KEY }}
-          WEB_EXT_API_SECRET: ${{ secrets.WEB_EXT_API_SECRET }}
+      - name: Rename file
+        run: mv stacks-wallet-chromium.zip stacks-wallet-firefox.zip
 
       - uses: actions/upload-artifact@v3
-        name: Upload Firefox Add-On XPI
         with:
-          name: connect-addon
-          path: web-ext-artifacts/*.xpi
+          name: stacks-wallet-firefox
+          path: stacks-wallet-firefox.zip