diff --git a/.github/workflows/build-browser.yml b/.github/workflows/build-browser.yml
index 05b89d66c3..b1242ee23e 100644
--- a/.github/workflows/build-browser.yml
+++ b/.github/workflows/build-browser.yml
@@ -114,9 +114,6 @@ jobs:
       - locales-test
     env:
       _BUILD_NUMBER: ${{ needs.setup.outputs.adj_build_number }}
-    defaults:
-      run:
-        working-directory: apps/browser
     steps:
       - name: Checkout repo
         uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
@@ -139,19 +136,6 @@ jobs:
           npm --version
           node-gyp --version
 
-      - name: NPM setup
-        run: npm ci
-        working-directory: ./
-
-      - name: Build
-        run: npm run dist
-
-      # - name: Build Manifest v3
-      #   run: npm run dist:mv3
-
-      - name: Gulp
-        run: gulp ci
-
       - name: Build sources for reviewers
         run: |
           # Include hidden files in glob copy
@@ -174,55 +158,70 @@ jobs:
           cp -r libs/* browser-source/libs
 
           zip -r browser-source.zip browser-source
-        working-directory: ./
+
+      - name: NPM setup
+        run: npm ci
+        working-directory: browser-source/
+
+      - name: Build
+        run: npm run dist
+        working-directory: browser-source/apps/browser
+
+      # - name: Build Manifest v3
+      #   run: npm run dist:mv3
+      #   working-directory: browser-source/apps/browser
+
+      - name: Gulp
+        run: gulp ci
+        working-directory: browser-source/apps/browser
 
       - name: Upload Opera artifact
         uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
         with:
           name: dist-opera-${{ env._BUILD_NUMBER }}.zip
-          path: apps/browser/dist/dist-opera.zip
+          path: browser-source/apps/browser/dist/dist-opera.zip
           if-no-files-found: error
 
       # - name: Upload Opera MV3 artifact
       #   uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
       #   with:
       #     name: dist-opera-MV3-${{ env._BUILD_NUMBER }}.zip
-      #     path: apps/browser/dist/dist-opera-mv3.zip
+      #     path: browser-source/apps/browser/dist/dist-opera-mv3.zip
       #     if-no-files-found: error
 
       - name: Upload Chrome artifact
         uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
         with:
           name: dist-chrome-${{ env._BUILD_NUMBER }}.zip
-          path: apps/browser/dist/dist-chrome.zip
+          path: browser-source/apps/browser/dist/dist-chrome.zip
           if-no-files-found: error
 
       # - name: Upload Chrome MV3 artifact
       #   uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
       #   with:
       #     name: dist-chrome-MV3-${{ env._BUILD_NUMBER }}.zip
-      #     path: apps/browser/dist/dist-chrome-mv3.zip
+      #     path: browser-source/apps/browser/dist/dist-chrome-mv3.zip
       #     if-no-files-found: error
 
       - name: Upload Firefox artifact
         uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
         with:
           name: dist-firefox-${{ env._BUILD_NUMBER }}.zip
-          path: apps/browser/dist/dist-firefox.zip
+          path: browser-source/apps/browser/dist/dist-firefox.zip
           if-no-files-found: error
 
       - name: Upload Edge artifact
         uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
         with:
           name: dist-edge-${{ env._BUILD_NUMBER }}.zip
-          path: apps/browser/dist/dist-edge.zip
+          path: browser-source/apps/browser/dist/dist-edge.zip
           if-no-files-found: error
 
       # - name: Upload Edge MV3 artifact
       #   uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
       #   with:
       #     name: dist-edge-MV3-${{ env._BUILD_NUMBER }}.zip
-      #     path: apps/browser/dist/dist-edge-mv3.zip
+      #     path: browser-source/apps/browser/dist/dist-edge-mv3.zip
       #     if-no-files-found: error
 
       - name: Upload browser source
@@ -237,7 +236,7 @@ jobs:
         uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
         with:
           name: coverage-${{ env._BUILD_NUMBER }}.zip
-          path: apps/browser/coverage/coverage-${{ env._BUILD_NUMBER }}.zip
+          path: browser-source/apps/browser/coverage/coverage-${{ env._BUILD_NUMBER }}.zip
           if-no-files-found: error
 
   build-safari: