diff --git a/.github/workflows/alpha.yml b/.github/workflows/alpha.yml
index 7f7d7781a..4ddfc5683 100644
--- a/.github/workflows/alpha.yml
+++ b/.github/workflows/alpha.yml
@@ -237,7 +237,7 @@ jobs:
       - name: Git Pull
         run: git pull
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
 
       - name: release-github
         uses: 'marvinpinto/action-automatic-releases@latest'
diff --git a/.github/workflows/windows-alpha-build.yml b/.github/workflows/windows-alpha-build.yml
index 701b57631..ffa94fa5a 100644
--- a/.github/workflows/windows-alpha-build.yml
+++ b/.github/workflows/windows-alpha-build.yml
@@ -152,32 +152,50 @@ jobs:
           ls ./dist
           ls .
 
+      - name: Move package for PGO upload
+        if: ${{ inputs.generate-gpo }}
+        run: |
+          set -x
+          mv ./zen.win64.zip ./zen.win64-pgo-stage-1.zip
+
       - name: Upload artifact
         uses: actions/upload-artifact@v3
+        if: ${{ !inputs.generate-gpo }}
         with:
           name: zen.win64.zip
           path: ./zen.win64.zip
 
+      - name: Upload PGO build
+        uses: actions/upload-artifact@v3
+        if: ${{ inputs.generate-gpo }}
+        with:
+          name: zen.win64-pgo-stage-1.zip
+          path: ./zen.win64-pgo-stage-1.zip
+ 
       - name: Upload mar
         uses: actions/upload-artifact@v3
+        if: ${{ !inputs.generate-gpo }}
         with:
           name: windows.mar
           path: ./windows.mar
 
       - name: Upload installer
         uses: actions/upload-artifact@v3
+        if: ${{ !inputs.generate-gpo }}
         with:
           name: zen.installer.exe
           path: ./dist/zen.installer.exe
 
       - name: Upload installer stub
         uses: actions/upload-artifact@v3
+        if: ${{ !inputs.generate-gpo }}
         with:
           name: zen.installer.pretty.exe
           path: ./dist/zen.installer.pretty.exe
 
       - name: Upload update manifests
         uses: actions/upload-artifact@v3
+        if: ${{ !inputs.generate-gpo }}
         with:
           name: windows_update_manifest
           path: ./dist/update
diff --git a/.github/workflows/windows-profile-build.yml b/.github/workflows/windows-profile-build.yml
index c8ddfb1ae..b81bb745f 100644
--- a/.github/workflows/windows-profile-build.yml
+++ b/.github/workflows/windows-profile-build.yml
@@ -26,8 +26,7 @@ jobs:
       - name:  Unpack artifact
         run: |
           cd C:\artifact
-          zstd -d zen-*.tar.zst
-          7z x zen-*.tar
+          7z x zen-*.zip
 
       - uses: actions/checkout@v4
         name: Clone 
@@ -46,7 +45,7 @@ jobs:
           echo "cd $workspace_dir" '' >> mozilla-build-run.sh
           echo 'export PATH=/c/mozilla-build/msys2/usr/bin:$PATH' '' >> mozilla-build-run.sh
           echo './mach --no-interactive bootstrap --application-choice browser' '' >> mozilla-build-run.sh
-          echo 'LLVM_PROFDATA=/c/Users/runneradmin/.mozbuild/clang/bin/llvm-profdata.exe JARLOG_FILE=en-US.log ./mach python build/pgo/profileserver.py --binary /c/artifact/floorp/floorp.exe' '' >> mozilla-build-run.sh
+          echo 'LLVM_PROFDATA=/c/Users/runneradmin/.mozbuild/clang/bin/llvm-profdata.exe JARLOG_FILE=en-US.log ./mach python build/pgo/profileserver.py --binary /c/artifact/zen/zen.exe' '' >> mozilla-build-run.sh
           C:\mozilla-build\start-shell.bat $workspace_dir\mozilla-build-run.sh
 
       - name: Publish 
diff --git a/configs/common/mozconfig b/configs/common/mozconfig
index 7c37b6722..58adf57d4 100644
--- a/configs/common/mozconfig
+++ b/configs/common/mozconfig
@@ -61,7 +61,12 @@ if test "$ZEN_RELEASE"; then
   export MOZ_LTO=full
   ac_add_options MOZ_LTO=full
   ac_add_options --enable-lto=full
-  ac_add_options --disable-jemalloc
+
+  if test "$ZEN_CROSS_COMPILING"; then
+    ac_add_options --disable-jemalloc
+  else
+    ac_add_options --enable-jemalloc
+  fi
 
   mk_add_options MOZILLA_OFFICIAL=1
   MOZILLA_OFFICIAL=1
@@ -77,8 +82,10 @@ if test "$ZEN_RELEASE"; then
   ac_add_options RUSTC_OPT_LEVEL="3"
 
   # PGO may cause link errors on windows!
-  export MOZ_PGO=1
-  ac_add_options MOZ_PGO=1
+  if ! test "$ZEN_CROSS_COMPILING"; then
+    export MOZ_PGO=1
+    ac_add_options MOZ_PGO=1
+  fi
 
   mk_add_options 'export RUSTC_WRAPPER=/home/runner/.mozbuild/sccache/sccache'
   mk_add_options 'export CCACHE_CPP2=yes'