diff --git a/.github/workflows/screenshots.yml b/.github/workflows/screenshots.yml
index 1334cc53adb..704451e72e1 100644
--- a/.github/workflows/screenshots.yml
+++ b/.github/workflows/screenshots.yml
@@ -39,8 +39,20 @@ jobs:
     - name: Archive App
       uses: actions/upload-artifact@v4
       with:
-        name: build
-        path: fastlane/DerivedData/Build/Products/
+        name: screenshot-app
+        path: fastlane/DerivedData/Build/Products/Debug-iphonesimulator/WooCommerce.app
+
+    - name: Archive Watch App
+      uses: actions/upload-artifact@v4
+      with:
+        name: watch-app
+        path: fastlane/DerivedData/Build/Products/Debug-watchsimulator/Woo Watch App.app
+
+    - name: Archive Runner
+      uses: actions/upload-artifact@v4
+      with:
+        name: screenshot-runner
+        path: fastlane/DerivedData/Build/Products/Debug-iphonesimulator/WooCommerceScreenshots-Runner.app
 
   capture:
     name: Capture
@@ -49,8 +61,8 @@ jobs:
 
     strategy:
       matrix:
-        language: [ar-SA, de-DE, en-US, es-ES, fr-FR, he, id, it, ja, ko, nl-NL, pt-BR, ru, sv, tr, zh-Hans, zh-Hant]
-        mode: [dark, light]
+        language: [ar-SA]
+        mode: [light]
     steps:
     - uses: actions/checkout@v1
     - name: "Set up Ruby"
@@ -64,8 +76,20 @@ jobs:
     - name: Download Screenshot App
       uses: actions/download-artifact@v4
       with:
-        name: build
-        path: fastlane/DerivedData/Build/Products/
+        name: screenshot-app
+        path: fastlane/DerivedData/Build/Products/Debug-iphonesimulator/WooCommerce.app
+
+    - name: Download Watch App
+      uses: actions/download-artifact@v4
+      with:
+        name: watch-app
+        path: fastlane/DerivedData/Build/Products/Debug-watchsimulator/Woo Watch App.app
+
+    - name: Download Screenshot Runner
+      uses: actions/download-artifact@v4
+      with:
+        name: screenshot-runner
+        path: fastlane/DerivedData/Build/Products/Debug-iphonesimulator/WooCommerceScreenshots-Runner.app
 
     - name: Generate Screenshots
       run: |
@@ -78,6 +102,13 @@ jobs:
         name: "screenshot-log-${{ matrix.language }}-${{ matrix.mode }}"
         path: fastlane/logs
 
+    - name: Store test results
+      if: always()
+      uses: actions/upload-artifact@v4
+      with:
+        name: "test-results-${{ matrix.language }}-${{ matrix.mode }}"
+        path: fastlane/screenshots/test_output
+
     - name: Archive Generated Screenshots
       run: |
         cd fastlane && mkdir $GITHUB_RUN_ID && mv screenshots $GITHUB_RUN_ID