diff --git a/.github/workflows/Build.yaml b/.github/workflows/Build.yaml
index bd63ea5e1..ed73484c3 100644
--- a/.github/workflows/Build.yaml
+++ b/.github/workflows/Build.yaml
@@ -295,9 +295,11 @@ jobs:
         with:
           cmdline-tools-version: 11479570
 
-      - name: Replace cmdlinetools
+      # android-emulator-runner uses /latest
+      - name: Replace cmdlinetools and set path
         run: |
           mv ${{ env.ANDROID_HOME}}/cmdline-tools/11479570 ${{ env.ANDROID_HOME}}/cmdline-tools/latest
+          echo ${{ env.ANDROID_HOME}}/cmdline-tools/latest >> $GITHUB_PATH
 
       - name: Debug Environment
         run: |
@@ -305,6 +307,15 @@ jobs:
           echo "SHELL: $SHELL"
         shell: bash
 
+      - name: Print debug avdmanager list
+        run: avdmanager list
+
+      - name: Print debug sdkmanager
+        run: |
+          sdkmanager --version
+          which sdkmanager
+          which avdmanager
+
       - name: Build projects and run instrumented screenshot tests
         id: dropshotsverify
         continue-on-error: true