diff --git a/.github/workflows/android.yaml b/.github/workflows/android.yaml
index 296573b665d0f..77189fcd451b5 100644
--- a/.github/workflows/android.yaml
+++ b/.github/workflows/android.yaml
@@ -40,3 +40,13 @@ jobs:
     steps:
       - name: Final collections
         run: echo ${{ needs.android-arm.outputs.first_output }}
+      - name: Download the gold thing
+        uses: actions/download-artifact@v3
+        with:
+          name: buildoutput-gold
+      - name: Download the qa thing
+        uses: actions/download-artifact@v3
+        with:
+          name: buildoutput-qa
+      - name: Doublecheck if all is there
+        run: find . -type f
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 12bd77bb93dc5..1eace978de9e9 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -254,14 +254,14 @@ jobs:
           echo "The artifacts we need to keep:" ${{ inputs.keep_artifacts }}
           echo "Full spec" out/${{ matrix.platform}}-${{ matrix.config }}/${{ inputs.keep_artifacts }}
           find . -name "*.apk"
-          ls -la out/${{ matrix.platform}}-${{ matrix.config }}/${{ inputs.keep_artifacts }}
+          ls -la out/${{ matrix.platform}}_${{ matrix.config }}/${{ inputs.keep_artifacts }}
           echo "firstword=hello"  >> $GITHUB_OUTPUT
       - name: 'Upload Artifact'
         uses: actions/upload-artifact@v3
         if: inputs.keep_artifacts
         with:
-          name: buildoutput
-          path: out/${{ matrix.platform}}-${{ matrix.config }}/${{ inputs.keep_artifacts }}
+          name: buildoutput-${{ matrix.config }}
+          path: out/${{ matrix.platform}}_${{ matrix.config }}/${{ inputs.keep_artifacts }}
           retention-days: 5
       - name: Run API Leak Detector
         uses: ./.github/actions/api_leak_detector