diff --git a/.github/workflows/windows-alpha-build.yml b/.github/workflows/windows-alpha-build.yml
index c2b8e7788..30e629a08 100644
--- a/.github/workflows/windows-alpha-build.yml
+++ b/.github/workflows/windows-alpha-build.yml
@@ -143,6 +143,7 @@ jobs:
         if: ${{ !inputs.generate-gpo }}
         with:
           path: ~/artifact
+          name: windows-profdata-${{ matrix.generic == true && 'generic' || 'specific' }}
 
       - name: Show artifact info
         if: ${{ !inputs.generate-gpo }}
diff --git a/.github/workflows/windows-profile-build.yml b/.github/workflows/windows-profile-build.yml
index 22f379fcb..0bc52a63f 100644
--- a/.github/workflows/windows-profile-build.yml
+++ b/.github/workflows/windows-profile-build.yml
@@ -70,7 +70,7 @@ jobs:
           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 'ls /c/Users/runneradmin/.mozbuild/clang/bin' '' >> mozilla-build-run.sh
-          echo 'LLVM_PROFDATA=/c/Users/runneradmin/.mozbuild/clang/bin/llvm-profdata.exe JARLOG_FILE=en-US-${{ matrix.generic == true && 'generic' || 'specific' }}.log ./mach python build/pgo/profileserver.py --binary /c/artifact/zen/zen.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_current\mozilla-build-run.sh
           
       - name: 🐛 Debug Session
@@ -82,17 +82,13 @@ jobs:
         run: |
           dir
           dir engine
-          mv engine/merged.profdata merged-${{ matrix.generic == true && 'generic' || 'specific' }}.profdata
-          mv engine/en-US-${{ matrix.generic == true && 'generic' || 'specific' }}.log en-US-${{ matrix.generic == true && 'generic' || 'specific' }}.log
+          mv engine/merged.profdata merged.profdata
+          mv engine/en-US.log en-US.log
 
-      - name: Publish merged.profdata
+      - name: Publish artifacts
         uses: actions/upload-artifact@v4
         with:
-          path: merged-${{ matrix.generic == true && 'generic' || 'specific' }}.profdata
-          name: merged-${{ matrix.generic == true && 'generic' || 'specific' }}.profdata
-
-      - name: Publish en-US.log
-        uses: actions/upload-artifact@v4
-        with:
-          path: en-US-${{ matrix.generic == true && 'generic' || 'specific' }}.log
-          name: en-US-${{ matrix.generic == true && 'generic' || 'specific' }}.log
\ No newline at end of file
+          path: |
+            merged.profdata
+            en-US.log
+          name: windows-profdata-${{ matrix.generic == true && 'generic' || 'specific' }}
\ No newline at end of file
diff --git a/configs/windows/mozconfig b/configs/windows/mozconfig
index 2c094ec20..fc6e6a16a 100644
--- a/configs/windows/mozconfig
+++ b/configs/windows/mozconfig
@@ -58,12 +58,7 @@ if test "$ZEN_GA_GENERATE_PROFILE"; then
   ac_add_options --enable-profile-generate=cross
 else
   ac_add_options --enable-profile-use=cross
-  if test "$SURFER_COMPAT" = "true"; then
-    ac_add_options --with-pgo-profile-path=$(echo ~)/artifact/merged-generic.profdata
-    ac_add_options --with-pgo-jarlog=$(echo ~)/artifact/en-US-generic.log
-  else
-    ac_add_options --with-pgo-profile-path=$(echo ~)/artifact/merged-specific.profdata
-    ac_add_options --with-pgo-jarlog=$(echo ~)/artifact/en-US-specific.log
-  fi
+  ac_add_options --with-pgo-profile-path=$(echo ~)/artifact/merged.profdata
+  ac_add_options --with-pgo-jarlog=$(echo ~)/artifact/en-US.log
 fi