diff --git a/.github/workflows/wasm-package.yml b/.github/workflows/wasm-package.yml
index 174e2b175..671e0e83c 100644
--- a/.github/workflows/wasm-package.yml
+++ b/.github/workflows/wasm-package.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-20.04
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true
 
@@ -36,7 +36,7 @@ jobs:
 
       - run: cd src/wasm_package && npm test
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: libwally-npm
           path: src/wasm_package/wallycore-*.tgz
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 4d886071d..42a4b07ad 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04, windows-2019, macos-14]
+        os: [ubuntu-22.04, windows-2022, macos-14]
     env:
       CIBW_BEFORE_ALL_LINUX: ./tools/install_swig.sh
       CIBW_BEFORE_ALL_MACOS: brew install gnu-sed swig automake libtool
@@ -26,7 +26,7 @@ jobs:
       SWIG_PATH: "C:\\ProgramData\\chocolatey\\lib\\swig\\tools\\install\\swigwin-3.0.12"
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true
           fetch-depth: 0
@@ -37,7 +37,7 @@ jobs:
 
       - name: Install qemu aarch64
         if: runner.os == 'Linux'
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v3
         with:
           platforms: arm64
 
@@ -48,6 +48,17 @@ jobs:
           CIBW_ARCHS_LINUX: "x86_64 aarch64"
           CIBW_ARCHS_MACOS: "x86_64 arm64 universal2"
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
+          name: wheels-${{ matrix.os }}-${{ strategy.job-index }}
           path: ./wheelhouse/*.whl
+
+  merge:
+    runs-on: ubuntu-latest
+    needs: build_wheels
+    steps:
+      - name: Merge Artifacts
+        uses: actions/upload-artifact/merge@v4
+        with:
+          name: all-wheels
+          pattern: wheels-*