diff --git a/.github/workflows/maestro.yml b/.github/workflows/maestro.yml
index 7302e4a27..b76f298c0 100644
--- a/.github/workflows/maestro.yml
+++ b/.github/workflows/maestro.yml
@@ -57,7 +57,7 @@ jobs:
       # https://ci.android.com/builds/branches/aosp-emu-master-dev/grid
       - name: Install Emulator
         run: |
-          curl --compressed --location --output emulator.zip $(curl --location --silent https://ci.android.com/builds/submitted/11162281/emulator-linux_aarch64/latest/sdk-repo-linux_aarch64-emulator-11162281.zip | grep -o 'https://storage[^"]*' | sed 's/\\u0026/\&/g')
+          curl --compressed --location --output emulator.zip $(curl --location --silent https://ci.android.com/builds/submitted/12656970/emulator-linux_aarch64/latest/sdk-repo-linux_aarch64-emulator-12656970.zip | grep -o 'https://storage[^"]*' | sed 's/\\u0026/\&/g')
           unzip -d $ANDROID_HOME -n -q emulator.zip
           rm -f emulator.zip
           cp $ANDROID_HOME/platform-tools/package.xml $ANDROID_HOME/emulator/package.xml
@@ -111,6 +111,7 @@ jobs:
           path: logcat_output.txt
 
       - name: Emulator logs
+        if: always()
         run: |
           cat nohup.out
         shell: bash