diff --git a/.github/workflows/windows-profile-build.yml b/.github/workflows/windows-profile-build.yml
index d042936e4..04daf1cad 100644
--- a/.github/workflows/windows-profile-build.yml
+++ b/.github/workflows/windows-profile-build.yml
@@ -38,8 +38,8 @@ jobs:
 
       - name: Setup Git
         run: |
-          git config --global user.email "mauro-balades@users.noreply.github.com"
-          git config --global user.name "mauro-balades"
+          git config --global user.email "mr-cheff@users.noreply.github.com"
+          git config --global user.name "mr-cheff"
 
       - name: Setup pnpm
         run: npm install -g pnpm
@@ -66,16 +66,19 @@ jobs:
           C:\MozillaBuildSetup-Latest.exe /S | out-null
 
       - name: Download Firefox and dependencies
+        if: ${{ matrix.arch == 'x86_64' }}
         run: |
           git config --global core.safecrlf false
           pnpm surfer download
 
       - name: Import patches
+        if: ${{ matrix.arch == 'x86_64' }}
         env:
           SURFER_NO_BRANDING_PATCH: true
         run: pnpm surfer import
 
       - name: Generate
+        if: ${{ matrix.arch == 'x86_64' }}
         run: |
           ls
           $Env:USE_MINTTY = "0"
@@ -95,6 +98,7 @@ jobs:
         timeout-minutes: 15
 
       - name: Move profile data
+        if: ${{ matrix.arch == 'x86_64' }}
         run: |
           dir
           dir engine
@@ -102,6 +106,7 @@ jobs:
           mv engine/en-US.log en-US.log
 
       - name: Upload artifacts
+        if: ${{ matrix.arch == 'x86_64' }}
         uses: actions/upload-artifact@v4
         with:
           retention-days: 1
diff --git a/.github/workflows/windows-release-build.yml b/.github/workflows/windows-release-build.yml
index fa75377d7..ed09ac6f8 100644
--- a/.github/workflows/windows-release-build.yml
+++ b/.github/workflows/windows-release-build.yml
@@ -138,13 +138,13 @@ jobs:
 
       - name: Download artifact (if use profdata)
         uses: actions/download-artifact@v4
-        if: ${{ !inputs.generate-gpo }}
+        if: ${{ !inputs.generate-gpo && matrix.arch == 'x86_64' }}
         with:
           path: ~/artifact
           name: windows-profdata-${{ matrix.arch == 'aarch64' && 'arm64' || matrix.arch }}
 
       - name: Show artifact info
-        if: ${{ !inputs.generate-gpo }}
+        if: ${{ !inputs.generate-gpo && matrix.arch == 'x86_64' }}
         run: |
           ls ~/artifact
           ls ~/artifact/en-US.log
diff --git a/configs/windows/mozconfig b/configs/windows/mozconfig
index 4981ef534..117a3a1dc 100644
--- a/configs/windows/mozconfig
+++ b/configs/windows/mozconfig
@@ -62,10 +62,10 @@ if test "$ZEN_CROSS_COMPILING"; then
     export CXXFLAGS="$CXXFLAGS -fprofile-generate -mllvm -enable-name-compression=false -mllvm -pgo-temporal-instrumentation -fprofile-update=atomic"
     mk_add_options "export MOZ_AUTOMATION_PACKAGE_GENERATED_SOURCES=0"
     ac_add_options --enable-profile-generate=cross
-  else
+  elif test "$SURFER_COMPAT" = "x86_64"; then
+    # Dont use PGO on aarch64 builds
     ac_add_options --enable-profile-use=cross
     ac_add_options --with-pgo-profile-path=$(echo ~)/artifact/merged.profdata
     ac_add_options --with-pgo-jarlog=$(echo ~)/artifact/en-US.log
   fi
-
 fi