diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index aaddf0183a6b..f6c8c33404d6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -929,19 +929,22 @@ jobs:
             export GEN_PGO=1
           fi
           ./mach build
-          ./mach package
       - name: "\U0001F3D7 Build Stage 2"
-        if: ${{ inputs.TRIGGER_EVENT == 'workflow_dispatch' }}
-        uses: coactions/setup-xvfb@v1
-        with:
-          run: LLVM_PROFDATA=$HOME/.mozbuild/clang/bin/llvm-profdata JARLOG_FILE=en-US.log ./mach python build/pgo/profileserver.py --binary obj-${{ env.ARCH }}/dist/waterfox/waterfox
-      - name: "\U0001F3D7 Build Stage 3"
         if: ${{ inputs.TRIGGER_EVENT == 'workflow_dispatch' }}
         run: |
+          sudo apt-get update --fix-missing;
+          sudo apt-get install mutter dbus-x11;
+          dbus-launch --auto-syntax > dbus-env;
+          source dbus-env;
+          mutter --no-x11 --headless --virtual-monitor 1920x1080 &
+          LLVM_PROFDATA=$HOME/.mozbuild/clang/bin/llvm-profdata JARLOG_FILE=en-US.log ./mach python build/pgo/profileserver.py --binary obj-${{ env.ARCH }}/dist/waterfox/waterfox
           unset GEN_PGO
           cp en-US.log ${{ env.GITHUB_WORKSPACE }}/
           cp merged.profdata ${{ env.GITHUB_WORKSPACE }}/
           ./mach clobber
+      - name: "\U0001F3D7 Build Stage 3"
+        if: ${{ inputs.TRIGGER_EVENT == 'workflow_dispatch' }}
+        run: |
           echo "${{ secrets.MOZ_API_KEY }}" > mozilla-api
           if [[ ${{ inputs.TRIGGER_EVENT }} == 'workflow_dispatch' ]]; then
             if [[ $PRE_RELEASE == 'true' ]]; then