diff --git a/.github/workflows/apk.yml b/.github/workflows/apk.yml
index ec6f78b0..0d3aa568 100644
--- a/.github/workflows/apk.yml
+++ b/.github/workflows/apk.yml
@@ -294,7 +294,7 @@ jobs:
         uses: actions/checkout@v6
 
       - name: Download trace fixture
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v8
         with:
           name: MobileGL-trace-fixture-${{ matrix.case.name }}
           path: trace-fixture-download
@@ -330,12 +330,11 @@ jobs:
             /usr/local/lib/android/sdk/system-images/android-35/google_apis/x86_64
           key: ${{ runner.os }}-mobilegl-avd-api35-google_apis-x86_64-pixel_6-v1-${{ hashFiles('android-plugin/run-avd-ci.sh') }}
 
-      - name: Download retrace APKs
-        uses: actions/download-artifact@v5
+      - name: Download retrace APK
+        uses: actions/download-artifact@v8
         with:
-          pattern: MobileGL-retrace-apk-*
+          name: MobileGL-plugin-trace-release-${{ github.sha }}.apk
           path: android-retrace-apks
-          merge-multiple: true
 
       - name: Enable KVM
         run: |
@@ -457,7 +456,7 @@ jobs:
           node-version: '22'
 
       - name: Download Android retrace results
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v8
         with:
           pattern: MobileGL-android-retrace-result-*
           path: retrace-artifacts
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a8ffbd92..d1e622df 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -135,7 +135,7 @@ jobs:
           sudo apt-get install -y libvulkan1 libegl1 libgles2 libgl1-mesa-dri mesa-vulkan-drivers
 
       - name: Download Linux runtime
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v8
         with:
           name: mobilegl-linux-runtime
           path: .
@@ -181,7 +181,7 @@ jobs:
           sudo apt-get install -y libvulkan1 libegl1 libgles2 libgl1-mesa-dri mesa-vulkan-drivers
 
       - name: Download Linux runtime
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v8
         with:
           name: mobilegl-linux-runtime
           path: .
@@ -268,7 +268,7 @@ jobs:
           dpkg -l 'libc++*' 'libegl*' 'libgles*' 'mesa*' 'vulkan*' || true
 
       - name: Download Linux runtime
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v8
         with:
           name: mobilegl-linux-runtime
           path: .
@@ -409,7 +409,7 @@ jobs:
         uses: actions/checkout@v6
 
       - name: Download trace fixture
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v8
         with:
           name: trace-fixture-${{ matrix.case }}
           path: trace-fixture-download
@@ -430,13 +430,13 @@ jobs:
           test -e /usr/lib/x86_64-linux-gnu/libGLESv2.so
 
       - name: Download Linux runtime
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v8
         with:
           name: mobilegl-linux-runtime
           path: .
 
       - name: Download trace replay
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v8
         with:
           name: mobilegl-trace-replay
           path: .
@@ -486,7 +486,7 @@ jobs:
           node-version: '22'
 
       - name: Download retrace results
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v8
         with:
           pattern: retrace-result-*
           path: retrace-artifacts