diff --git a/.gitea/workflows/android.yaml b/.gitea/workflows/android.yaml
index 29c8a39..0b7cc6f 100644
--- a/.gitea/workflows/android.yaml
+++ b/.gitea/workflows/android.yaml
@@ -5,6 +5,8 @@ on: [push]
 jobs:
   build:
     runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/cirruslabs/android-sdk:35
     steps:
       - name: Build APK
         env:
@@ -12,13 +14,12 @@ jobs:
         run: |
           set -eu
 
-          if command -v sudo >/dev/null 2>&1; then
-            sudo apt-get update
-            sudo apt-get install -y git curl unzip openjdk-17-jdk
-          else
+          if ! command -v git >/dev/null 2>&1 || ! command -v curl >/dev/null 2>&1 || ! command -v unzip >/dev/null 2>&1; then
             apt-get update
-            apt-get install -y git curl unzip openjdk-17-jdk
+            apt-get install -y git curl unzip
           fi
+          java -version
+          sdkmanager --version
 
           WORKDIR="${PWD}/source"
           rm -rf "${WORKDIR}"
@@ -37,16 +38,10 @@ jobs:
           fi
           export PATH="${GRADLE_HOME}/bin:${PATH}"
 
-          export ANDROID_HOME="${PWD}/.ci/android-sdk"
+          export ANDROID_HOME="${ANDROID_HOME:-${ANDROID_SDK_ROOT:-/opt/android-sdk-linux}}"
           export ANDROID_SDK_ROOT="${ANDROID_HOME}"
           export CMDLINE_TOOLS="${ANDROID_HOME}/cmdline-tools/latest"
-          if [ ! -x "${CMDLINE_TOOLS}/bin/sdkmanager" ]; then
-            mkdir -p "${ANDROID_HOME}/cmdline-tools"
-            curl -fsSL -o .ci/android-tools.zip https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip
-            unzip -q .ci/android-tools.zip -d "${ANDROID_HOME}/cmdline-tools"
-            mv "${ANDROID_HOME}/cmdline-tools/cmdline-tools" "${CMDLINE_TOOLS}"
-          fi
-          export PATH="${CMDLINE_TOOLS}/bin:${ANDROID_HOME}/platform-tools:${PATH}"
+          export PATH="${CMDLINE_TOOLS}/bin:${ANDROID_HOME}/platform-tools:${ANDROID_HOME}/tools/bin:${PATH}"
 
           yes | sdkmanager --licenses >/dev/null || true
           sdkmanager "platforms;android-35" "build-tools;35.0.0" "platform-tools"