diff --git a/.github/workflows/test-e2e.yaml b/.github/workflows/test-e2e.yaml
index 4e55f50649..759607bd91 100644
--- a/.github/workflows/test-e2e.yaml
+++ b/.github/workflows/test-e2e.yaml
@@ -162,13 +162,13 @@ jobs:
         run: |
           adb shell pkill -SIGINT screenrecord || echo "exited with code $?" && exit 0
           sleep 5 # prevent video file corruption
-          adb pull /sdcard/screenrecord.mp4 ~/maestro_screenrecord.mp4
+          adb pull /sdcard/screenrecord.mp4 ~/screenrecord.mp4
 
       - name: Upload ~/.maestro artifacts
         uses: actions/upload-artifact@v4
         if: success() || failure()
         with:
-          name: maestro-e2e-output
+          name: maestro-root-dir-android
           path: ~/.maestro
           retention-days: 7
           include-hidden-files: true
@@ -177,8 +177,8 @@ jobs:
         uses: actions/upload-artifact@v4
         if: success() || failure()
         with:
-          name: maestro_screenrecord.mp4
-          path: ~/maestro_screenrecord.mp4
+          name: maestro-screenrecord-android.mp4
+          path: ~/screenrecord.mp4
           retention-days: 7
 
   test-local-ios:
@@ -228,16 +228,24 @@ jobs:
         working-directory: ${{ github.workspace }}/e2e
         run: ./install_apps
 
+      - name: Start screen recording
+        run: |
+          xcrun simctl io booted recordVideo --codec h264 ~/screenrecord.mp4 &
+          echo $! > ~/screenrecord.pid
+
       - name: Run tests
         working-directory: ${{ github.workspace }}/e2e
         timeout-minutes: 30
         run: ./run_tests
 
+      - name: Stop screen recording
+        run: kill -SIGINT "$(cat ~/screenrecord.pid)"
+
       - name: Upload ~/.maestro artifacts
         uses: actions/upload-artifact@v4
         if: success() || failure()
         with:
-          name: maestro-e2e-output
+          name: maestro-root-dir-ios
           path: ~/.maestro
           retention-days: 7
           include-hidden-files: true
@@ -251,3 +259,11 @@ jobs:
           retention-days: 7
           include-hidden-files: true
 
+      - name: Upload screen recording of AVD
+        uses: actions/upload-artifact@v4
+        if: success() || failure()
+        with:
+          name: maestro-screenrecord-ios.mp4
+          path: ~/screenrecord.mp4
+          retention-days: 7
+