diff --git a/.gitea/workflows/build-apk.yml b/.gitea/workflows/build-apk.yml
index 721ffd8..d3dbbcd 100644
--- a/.gitea/workflows/build-apk.yml
+++ b/.gitea/workflows/build-apk.yml
@@ -44,28 +44,24 @@ jobs:
 
           cd $ANDROID_HOME
 
-          # Download command line tools
           curl -o cmdline-tools.zip https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip
-
-          # Extract
           unzip -q cmdline-tools.zip
           rm cmdline-tools.zip
 
-          # Fix folder structure (IMPORTANT: zip contains cmdline-tools/cmdline-tools/)
-          mv cmdline-tools/cmdline-tools cmdline-tools/latest
+          mv cmdline-tools cmdline-tools-temp
+          mkdir -p cmdline-tools/latest
+          mv cmdline-tools-temp/* cmdline-tools/latest/
 
-          # Add tools to PATH (sdkmanager lives here)
           export PATH=$ANDROID_HOME/cmdline-tools/latest/bin:$PATH
-          export PATH=$ANDROID_HOME/platform-tools:$PATH
 
-          # Accept licenses
-          yes | sdkmanager --sdk_root=$ANDROID_SDK_ROOT --licenses
+          # IMPORTANT: prevent interactive prompts completely
+          yes "" | sdkmanager --sdk_root=$ANDROID_SDK_ROOT --licenses > /dev/null || true
 
-          # Install required SDK components
-          sdkmanager --sdk_root=$ANDROID_SDK_ROOT \
+          sdkmanager --sdk_root=$ANDROID_SDK_ROOT --install \
             "platform-tools" \
             "platforms;android-33" \
-            "build-tools;33.0.0"
+            "build-tools;33.0.0" \
+            --verbose
 
       - name: 🔧 Set env
         run: |