diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 907f997c1..52f9890d8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -175,9 +175,13 @@ jobs:
 
       - name: Build
         run: |
-           EXISTING_MINETEST_DIR=$PWD ./util/buildbot/buildwin32.sh winbuild
-        env:
-          NO_PACKAGE: 1
+           EXISTING_MINETEST_DIR=$PWD ./util/buildbot/buildwin32.sh B
+
+      - uses: actions/upload-artifact@v3
+        with:
+          name: mingw32
+          path: B/build/*.zip
+          if-no-files-found: error
 
   win64:
     name: "MinGW cross-compiler (64-bit)"
@@ -192,9 +196,13 @@ jobs:
 
       - name: Build
         run: |
-          EXISTING_MINETEST_DIR=$PWD ./util/buildbot/buildwin64.sh winbuild
-        env:
-          NO_PACKAGE: 1
+          EXISTING_MINETEST_DIR=$PWD ./util/buildbot/buildwin64.sh B
+
+      - uses: actions/upload-artifact@v3
+        with:
+          name: mingw64
+          path: B/build/*.zip
+          if-no-files-found: error
 
   msvc:
     name: VS 2019 ${{ matrix.config.arch }}-${{ matrix.type }}
diff --git a/util/buildbot/buildwin64.sh b/util/buildbot/buildwin64.sh
index 92a522ece..dba08b071 100755
--- a/util/buildbot/buildwin64.sh
+++ b/util/buildbot/buildwin64.sh
@@ -53,7 +53,7 @@ get_sources
 git_hash=$(cd $sourcedir && git rev-parse --short HEAD)
 
 # Build the thing
-cd $sourcedir
+cd $builddir
 [ -d build ] && rm -rf build
 
 cmake_args=(