diff --git a/.github/workflows/linux-release-build.yml b/.github/workflows/linux-release-build.yml
index 8b73de2be..337abd447 100644
--- a/.github/workflows/linux-release-build.yml
+++ b/.github/workflows/linux-release-build.yml
@@ -16,7 +16,7 @@ jobs:
   build-linux:
     permissions:
       contents: write
-    runs-on: ${{ inputs.release-branch == 'release' && 'warp-ubuntu-latest-x64-8x' || 'ubuntu-latest' }}
+    runs-on: ${{ inputs.release-branch == 'release' && 'warp-ubuntu-latest-x64-16x' || 'ubuntu-latest' }}
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/windows-release-build.yml b/.github/workflows/windows-release-build.yml
index 366c98faf..4fbb1542f 100644
--- a/.github/workflows/windows-release-build.yml
+++ b/.github/workflows/windows-release-build.yml
@@ -22,7 +22,7 @@ on:
 jobs:
   windows-build:
     name: Build Windows - ${{ matrix.arch }}
-    runs-on: ${{ (inputs.release-branch == 'release' && !(inputs.generate-gpo && matrix.arch == 'aarch64')) && 'warp-ubuntu-latest-x64-8x' || 'ubuntu-latest' }}
+    runs-on: ${{ (inputs.release-branch == 'release' && !(inputs.generate-gpo && matrix.arch == 'aarch64')) && 'warp-ubuntu-latest-x64-16x' || 'ubuntu-latest' }}
 
     strategy:
       fail-fast: false
diff --git a/configs/windows/mozconfig b/configs/windows/mozconfig
index e1ddf0e42..136c530e7 100644
--- a/configs/windows/mozconfig
+++ b/configs/windows/mozconfig
@@ -60,7 +60,7 @@ if test "$ZEN_CROSS_COMPILING"; then
   elif test "$SURFER_COMPAT" = "x86_64"; then
     # Dont use PGO on aarch64 builds and the ZEN_GA_DISABLE_PGO flag is not set
     if test "$ZEN_GA_DISABLE_PGO"; then
-      echo "PGO is disabled"
+      export ZEN_DUMMY=1
     else
       ac_add_options --enable-profile-use=cross
       ac_add_options --with-pgo-profile-path=$(echo ~)/artifact/merged.profdata