diff --git a/.github/workflows/android_ci.yml b/.github/workflows/android_ci.yml
index ef6d85bef..16bca38a3 100644
--- a/.github/workflows/android_ci.yml
+++ b/.github/workflows/android_ci.yml
@@ -1,63 +1,63 @@
 name: Android Build CI
 
 on:
   push:
     branches:
       - master
       - 'debugci/android_ci/*'
     paths-ignore:
       - 'landing/**'
       - 'web/**'
       - 'docs/**'
       - 'keyserver/**'
       - 'desktop/**'
 
 jobs:
   build:
     runs-on: macos-14
 
     steps:
       - uses: actions/checkout@v3
 
       - name: rustup target add aarch64-linux-android arm-linux-androideabi x86_64-linux-android
         run: rustup target add aarch64-linux-android arm-linux-androideabi x86_64-linux-android
 
       - name: Install Protobuf compiler
         working-directory: ./scripts
         run: sudo ./install_protobuf.sh
 
       - name: Set up Python 3.12
         uses: actions/setup-python@v4
         with:
           python-version: 3.12
 
       - name: Fix node-gyp
         run: python -m pip install packaging setuptools
 
       - name: yarn ci-cleaninstall
         run: yarn ci-cleaninstall
 
+      - name: Set up tmate session
+        if: failure()
+        uses: mxschmitt/action-tmate@v3
+
       - name: Save ANDROID_KEY_STORE_B64 to file
         env:
           ANDROID_KEY_STORE_B64: ${{secrets.ANDROID_KEY_STORE_B64}}
         run: echo "$ANDROID_KEY_STORE_B64" > ANDROID_KEY_STORE_B64.b64
 
       - name: Save ANDROID_KEY_STORE to file
         run: base64 -d -i ANDROID_KEY_STORE_B64.b64 -o android_key_store.keystore
 
       - name: Configure gradle.properties
         run: |
           mkdir -p ~/.gradle
           touch ~/.gradle/gradle.properties
           echo "COMM_UPLOAD_STORE_FILE=$(pwd)/android_key_store.keystore" >> ~/.gradle/gradle.properties
           echo "COMM_UPLOAD_KEY_ALIAS=AndroidSigningKey" >> ~/.gradle/gradle.properties
 
       - name: Build with Gradle
         working-directory: ./native/android
         env:
           ANDROID_SIGNING_PASSWORD: ${{secrets.ANDROID_SIGNING_PASSWORD}}
         run: JAVA_HOME=${JAVA_HOME_11_arm64} ./gradlew bundleRelease
-
-      - name: Set up tmate session
-        if: failure()
-        uses: mxschmitt/action-tmate@v3