diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml
index fda72df8694b24..9d6c3366bd9edf 100644
--- a/.github/actions/build/action.yml
+++ b/.github/actions/build/action.yml
@@ -49,10 +49,14 @@ runs:
       - name: sccache check
         run: sccache -s
         shell: bash
+      - name: find apks
+        run: find src/out -name \*.apk -print
+        shell: bash
       - name: Archive Android APKs
         if: startsWith(${{matrix.platform}}, 'android')
         uses: actions/upload-artifact@v4
         with:
-          name: APKs
+          name: ${{ matrix.platform }} APKs
           path: |
-            src/out/android-arm64_qa/apks/*.apk
+            src/out/${{ matrix.platform }}_qa/apks/*.apk
+            src/out/${{ matrix.platform }}_qa/*_apk/*.apk
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 98536fd0375526..304095ac17bc8f 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -19,7 +19,6 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.event_name }}-${{ inputs.platform }} @ ${{ github.event.label.name || github.event.pull_request.number || github.sha }} @ ${{ github.event.label.name && github.event.pull_request.number || github.event.action }}
   cancel-in-progress: true
 
-
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   # Retrieves configuration from json file.
@@ -110,7 +109,7 @@ jobs:
         echo "FLOATING_TAG=${tag}" >> $GITHUB_ENV
     # Handle GitHub registry used for everything other than pull requests off forked repos.
     - name: Login to GitHub Docker Registry ${{env.GITHUB_REGISTRY}}
-      if: ${{ (github.event_name != 'pull_request') || (github.event.pull_request.head.repo.full_name == github.repository) }}
+      if: ${{ github.event.pull_request.head.repo.full_name == github.repository }}
       uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # v2.1.0
       with:
         registry: ${{ env.GITHUB_REGISTRY }}
@@ -118,7 +117,7 @@ jobs:
         password: ${{ secrets.GITHUB_TOKEN }}
     - name: Set Docker Tag
       id: set-docker-tag-github
-      if: ${{ (github.event_name != 'pull_request') || (github.event.pull_request.head.repo.full_name == github.repository) }}
+      if: ${{ github.event.pull_request.head.repo.full_name == github.repository }}
       run: |
         echo "DOCKER_TAG=${GITHUB_REGISTRY}/${{ github.repository }}/${DOCKER_SERVICE}:${FULL_GIT_SHA::7}" >> $GITHUB_ENV
         echo "DOCKER_FLOATING_TAG=${GITHUB_REGISTRY}/${{ github.repository }}/${DOCKER_SERVICE}:${FLOATING_TAG}" >> $GITHUB_ENV
@@ -193,4 +192,4 @@ jobs:
         uses: ./src/.github/actions/build
         with:
           targets: ${{ needs.initialize.outputs.targets }}
-  
\ No newline at end of file
+