diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index b789d12a..62ff760b 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -28,17 +28,18 @@ jobs:
           apt-get install -y openjdk-11-jdk wget
           wget https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip -O commandlinetools.zip
           unzip commandlinetools.zip
-          mkdir -p ${{ env.java_version }}Android/Sdk/cmdline-tools/latest
-          mv cmdline-tools/* ${{ env.java_version }}Android/Sdk/cmdline-tools/latest/
-          export ANDROID_SDK_ROOT=${{ env.java_version }}Android/Sdk
-          export PATH=$PATH:${{ env.java_version }}Android/Sdk/cmdline-tools/latest/bin
+          mkdir -p ${{ env.my_local_cache_dir }}Android/Sdk/cmdline-tools/latest
+          mv cmdline-tools/* ${{ env.my_local_cache_dir }}Android/Sdk/cmdline-tools/latest/
+          export ANDROID_SDK_ROOT=${{ env.my_local_cache_dir }}Android/Sdk
+          export PATH=$PATH:${{ env.my_local_cache_dir }}Android/Sdk/cmdline-tools/latest/bin
           yes | sdkmanager --licenses 2>/dev/null || true                                
 
       - name: Set up Android environment variables
+        id: "android-env-setup"
         run: |
-          echo "ANDROID_SDK_ROOT=${{ env.java_version }}Android/Sdk" >> $GITHUB_ENV
-          echo "PATH=$PATH:${{ env.java_version }}Android/Sdk/cmdline-tools/latest/bin:/opt/hostedtoolcache/Android/Sdk/platform-tools:/opt/hostedtoolcache/Android/Sdk/build-tools/30.0.3" >> $GITHUB_ENV
-          echo "ANDROID_HOME=${{ env.java_version }}Android/Sdk" >> $GITHUB_ENV                              
+          echo "ANDROID_SDK_ROOT=${{ env.my_local_cache_dir }}Android/Sdk" >> $GITHUB_ENV
+          echo "PATH=$PATH:${{ env.my_local_cache_dir }}Android/Sdk/cmdline-tools/latest/bin:/opt/hostedtoolcache/Android/Sdk/platform-tools:/opt/hostedtoolcache/Android/Sdk/build-tools/30.0.3" >> $GITHUB_ENV
+          echo "ANDROID_HOME=${{ env.my_local_cache_dir }}Android/Sdk" >> $GITHUB_ENV                              
 
       - name: Install jq
         run: apt-get install -y jq                              
@@ -52,8 +53,8 @@ jobs:
 
       - name: Fix dir permissions
         run: |
-          git config --global --add safe.directory ${{ env.java_version }}flutter/${{ env.flutter_channel }}-${{ env.flutter_version }}-${{ steps.flutter-action.outputs.ARCHITECTURE }}
-          flutter config --android-sdk="$ANDROID_HOME"
+          git config --global --add safe.directory ${{ env.my_local_cache_dir }}flutter/${{ env.flutter_channel }}-${{ env.flutter_version }}-${{ steps.flutter-action.outputs.ARCHITECTURE }}
+          flutter config --android-sdk="${{ steps.android-env-setup.outputs.ANDROID_HOME}}"
           flutter doctor -v                              
 
       - name: Get dependencies