diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml
index efd30828..29232ced 100644
--- a/.gitea/workflows/build.yml
+++ b/.gitea/workflows/build.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Install Android SDK
         run: |
           apt-get update
-          apt-get install -y openjdk-11-jdk wget
+          apt-get install -y openjdk-11-jdk wget xz-utils tar
           wget https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip -O commandlinetools.zip
           unzip commandlinetools.zip
           mkdir -p $HOME/Android/Sdk/cmdline-tools/latest
diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index f6cc36bc..9f960e58 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -81,8 +81,7 @@ jobs:
       - name: Install utils for Android SDK
         run: |
           apt-get update
-          apt-get install -y openjdk-17-jdk wget jq clang cmake ninja-build libgtk-3-dev          
-
+          apt-get install -y openjdk-17-jdk wget jq clang cmake ninja-build libgtk-3-dev xz-utils tar unzip
       - name: Install Android SDK
         if: steps.cache-sdk.outputs.cache-hit != 'true'
         run: |
@@ -116,9 +115,9 @@ jobs:
           flutter-version: ${{ env.flutter_version }}
           cache: true
           cache-key: "flutter-:os:-:channel:-:version:-:arch:-:hash:" # optional, change this to force refresh cache
-          cache-path: "${{ runner.tool_cache }}/flutter/:channel:-:version:-:arch:" # optional, change this to specify the cache path
+          cache-path: "${{ env.my_local_cache_dir }}flutter/:channel:-:version:-:arch:" # optional, change this to specify the cache path
           pub-cache-key: "flutter-pub:os:-:channel:-:version:-:arch:-:hash:" # optional, change this to force refresh cache of dart pub get dependencies
-          pub-cache-path: "${{ runner.tool_cache }}/flutter/:channel:-:version:-:arch:" # optional, change this to specify the cache path
+          pub-cache-path: "${{ env.my_local_cache_dir }}flutter/:channel:-:version:-:arch:" # optional, change this to specify the cache path
 
       # - name: Print flutter-action outputs
       #   shell: bash