diff --git a/.github/workflows/build-all.yml b/.github/workflows/build-all.yml
index 13420ad1..03ec8ede 100755
--- a/.github/workflows/build-all.yml
+++ b/.github/workflows/build-all.yml
@@ -90,11 +90,10 @@ jobs:
 
     steps:
 
-    - name: Setup Python 3.7
-      uses: actions/setup-python@v1
-      with:
-        python-version: '3.7' # Version range or exact version of a Python version to use, using semvers version range syntax.
-        architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
+    - name: Setup Python
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.x'
 
     - name: Install PlatformIO
       run: |
@@ -124,8 +123,10 @@ jobs:
     #     .pio/build/${{ matrix.platform }}/${{ matrix.platform }}_v*.hex
 
     - name: Archive all artifacts into one ZIP file
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: Knuwurst-all-in-one-${{github.sha}}
+        pattern: Knuwurst-all-in-one-${{github.sha}}-*
++       merge-multiple: true
         path: |
          .pio/build/${{ matrix.platform }}/${{ matrix.platform }}_v*.hex