diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 089139614..32fc355ba 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -59,9 +59,9 @@ jobs:
           go-version: "${{ env.GO_VERSION }}"
       - name: Build linux/${{ matrix.platform }}
         run: make build -j$(nproc) GOOS=linux GOARCH=${{ matrix.platform }}
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
-          name: binaries
+          name: ${{ matrix.platform }}-binaries
           path: bin/*
   package:
     name: Package
@@ -95,10 +95,11 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Download all binaries
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
-          name: binaries
+          name: *-binaries
           path: ./bin
+          merge-multiple: true
       # Artifact upload doesn't preserve permissions so we need to fix them before use in
       # the Dockerfiles.
       - name: Fix permissions