diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index 1d8a1685..b789d12a 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -6,6 +6,7 @@ env:
   flutter_version: "3.24.5"
   java_version: "21.x"
   flutter_channel: "stable"
+  my_local_cache_dir: "/opt/hostedtoolcache/"
 
 jobs:
   build:
@@ -27,17 +28,17 @@ 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 /opt/hostedtoolcache/Android/Sdk/cmdline-tools/latest
-          mv cmdline-tools/* /opt/hostedtoolcache/Android/Sdk/cmdline-tools/latest/
-          export ANDROID_SDK_ROOT=/opt/hostedtoolcache/Android/Sdk
-          export PATH=$PATH:/opt/hostedtoolcache/Android/Sdk/cmdline-tools/latest/bin
+          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
           yes | sdkmanager --licenses 2>/dev/null || true                                
 
       - name: Set up Android environment variables
         run: |
-          echo "ANDROID_SDK_ROOT=/opt/hostedtoolcache/Android/Sdk" >> $GITHUB_ENV
-          echo "PATH=$PATH:/opt/hostedtoolcache/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=/opt/hostedtoolcache/Android/Sdk" >> $GITHUB_ENV                              
+          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                              
 
       - name: Install jq
         run: apt-get install -y jq                              
@@ -51,7 +52,7 @@ jobs:
 
       - name: Fix dir permissions
         run: |
-          git config --global --add safe.directory /opt/hostedtoolcache/flutter/${{ env.flutter_channel }}-${{ env.flutter_version }}-${{ steps.flutter-action.outputs.ARCHITECTURE }}
+          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"
           flutter doctor -v