diff --git a/.gitea/workflows/pull_request.yaml b/.gitea/workflows/pull_request.yaml
index 4daad71..9270692 100644
--- a/.gitea/workflows/pull_request.yaml
+++ b/.gitea/workflows/pull_request.yaml
@@ -19,25 +19,7 @@ jobs:
       - name: Setup Android SDK
         uses: android-actions/setup-android@v3
 
-      - name: Install Flutter (wget)
-        run: |
-          wget --show-progress --progress=bar:force:noscroll:giga https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.38.2-stable.tar.xz
-          tar xf flutter_linux_3.38.2-stable.tar.xz
-          git config --global --add safe.directory "$(pwd)/flutter"
-          echo "$(pwd)/flutter/bin" >> $GITEA_PATH
-
-      - name: Get dependencies
-        run: flutter pub get
-
-      - name: Build APK
-        run: flutter build apk --release
-
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
+      # Required for Flutter action
       - name: Install jq
         run: |
           apt-get update
@@ -49,12 +31,31 @@ jobs:
           channel: stable
           flutter-version: 3.38.6
 
-      #- name: Install Flutter (wget)
-      #  run: |
-      #    wget --show-progress --progress=bar:force:noscroll:giga https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.38.2-stable.tar.xz
-      #    tar xf flutter_linux_3.38.2-stable.tar.xz
-      #    git config --global --add safe.directory "$(pwd)/flutter"
-      #    echo "$(pwd)/flutter/bin" >> $GITEA_PATH
+      - name: Get dependencies
+        run: |
+          git config --global --add safe.directory /opt/hostedtoolcache/flutter/stable-3.38.6-x64
+          flutter pub get
+
+      - name: Build APK
+        run: flutter build apk --release
+
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      # Required for Flutter action
+      - name: Install jq
+        run: |
+          apt-get update
+          apt-get install -y jq 
+
+      - name: Set up Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: stable
+          flutter-version: 3.38.6
 
       - name: Get dependencies
         run: |
@@ -70,15 +71,22 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Install Flutter (wget)
+      # Required for Flutter action
+      - name: Install jq
         run: |
-          wget --show-progress --progress=bar:force:noscroll:giga https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.38.2-stable.tar.xz
-          tar xf flutter_linux_3.38.2-stable.tar.xz
-          git config --global --add safe.directory "$(pwd)/flutter"
-          echo "$(pwd)/flutter/bin" >> $GITEA_PATH
+          apt-get update
+          apt-get install -y jq 
+
+      - name: Set up Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: stable
+          flutter-version: 3.38.6
 
       - name: Get dependencies
-        run: flutter pub get
+        run: |
+          git config --global --add safe.directory /opt/hostedtoolcache/flutter/stable-3.38.6-x64
+          flutter pub get
 
       - name: Run tests
         run: flutter test
diff --git a/.gitea/workflows/push.yaml b/.gitea/workflows/push.yaml
index 20319e2..896579d 100644
--- a/.gitea/workflows/push.yaml
+++ b/.gitea/workflows/push.yaml
@@ -13,15 +13,22 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Install Flutter (wget)
+      # Required for Flutter action
+      - name: Install jq
         run: |
-          wget --show-progress --progress=bar:force:noscroll:giga https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.38.2-stable.tar.xz
-          tar xf flutter_linux_3.38.2-stable.tar.xz
-          git config --global --add safe.directory "$(pwd)/flutter"
-          echo "$(pwd)/flutter/bin" >> $GITEA_PATH
+          apt-get update
+          apt-get install -y jq 
+
+      - name: Set up Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: stable
+          flutter-version: 3.38.6
 
       - name: Get dependencies
-        run: flutter pub get
+        run: |
+          git config --global --add safe.directory /opt/hostedtoolcache/flutter/stable-3.38.6-x64
+          flutter pub get
 
       - name: Run tests
         run: flutter test
@@ -32,15 +39,22 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Install Flutter (wget)
+      # Required for Flutter action
+      - name: Install jq
         run: |
-          wget --show-progress --progress=bar:force:noscroll:giga https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.38.2-stable.tar.xz
-          tar xf flutter_linux_3.38.2-stable.tar.xz
-          git config --global --add safe.directory "$(pwd)/flutter"
-          echo "$(pwd)/flutter/bin" >> $GITEA_PATH
+          apt-get update
+          apt-get install -y jq 
+
+      - name: Set up Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: stable
+          flutter-version: 3.38.6
 
       - name: Get dependencies
-        run: flutter pub get
+        run: |
+          git config --global --add safe.directory /opt/hostedtoolcache/flutter/stable-3.38.6-x64
+          flutter pub get
 
       - name: Check code format
         id: check_format