diff --git a/.github/workflows/build-mobile-comment.yml b/.github/workflows/build-mobile-comment.yml
index bd3e6bf..eaba86b 100644
--- a/.github/workflows/build-mobile-comment.yml
+++ b/.github/workflows/build-mobile-comment.yml
@@ -51,17 +51,8 @@ jobs:
       - name: Install dependencies
         run: pnpm install
 
-      - name: Cache Gradle Wrapper
-        uses: actions/cache@v4
-        with:
-          path: ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('./gradle/wrapper/gradle-wrapper.properties') }}
-
-      - name: Cache Gradle Dependencies
-        uses: actions/cache@v4
-        with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-caches-${{ hashFiles('./gradle/wrapper/gradle-wrapper.properties') }}
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
 
       - name: Build Android app
         run: cd apps/expo && pnpm apk
@@ -113,8 +104,10 @@ jobs:
       - name: Cache Pods
         uses: actions/cache@v4
         with:
-         path: ./apps/expo/ios/Pods
-         key: ${{ runner.os }}-pods-${{ hashFiles('./apps/expo/ios/Podfile.lock') }}
+          path: '**/Pods'
+          key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-pods-
 
       - name: Build iOS app
         run: cd apps/expo && pnpm ipa
diff --git a/.github/workflows/build-mobile.yml b/.github/workflows/build-mobile.yml
index bd7e6a1..4230a0d 100644
--- a/.github/workflows/build-mobile.yml
+++ b/.github/workflows/build-mobile.yml
@@ -47,17 +47,8 @@ jobs:
       - name: Install dependencies
         run: pnpm install
 
-      - name: Cache Gradle Wrapper
-        uses: actions/cache@v4
-        with:
-          path: ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('./gradle/wrapper/gradle-wrapper.properties') }}
-
-      - name: Cache Gradle Dependencies
-        uses: actions/cache@v4
-        with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-caches-${{ hashFiles('./gradle/wrapper/gradle-wrapper.properties') }}
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
 
       - name: Build Android app
         run: cd apps/expo && pnpm apk
@@ -104,8 +95,10 @@ jobs:
       - name: Cache Pods
         uses: actions/cache@v4
         with:
-         path: ./apps/expo/ios/Pods
-         key: ${{ runner.os }}-pods-${{ hashFiles('./apps/expo/ios/Podfile.lock') }}
+         path: '**/Pods'
+         key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
+         restore-keys: |
+           ${{ runner.os }}-pods-
 
       - name: Build iOS app
         run: cd apps/expo && pnpm ipa
diff --git a/.github/workflows/release-mobile.yml b/.github/workflows/release-mobile.yml
index d472a2d..cf18baf 100644
--- a/.github/workflows/release-mobile.yml
+++ b/.github/workflows/release-mobile.yml
@@ -71,17 +71,8 @@ jobs:
       - name: Install dependencies
         run: pnpm install
 
-      - name: Cache Gradle Wrapper
-        uses: actions/cache@v4
-        with:
-          path: ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('./gradle/wrapper/gradle-wrapper.properties') }}
-
-      - name: Cache Gradle Dependencies
-        uses: actions/cache@v4
-        with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-caches-${{ hashFiles('./gradle/wrapper/gradle-wrapper.properties') }}
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
 
       - name: Build Android app
         run: cd apps/expo && pnpm apk
@@ -132,8 +123,10 @@ jobs:
       - name: Cache Pods
         uses: actions/cache@v4
         with:
-         path: ./apps/expo/ios/Pods
-         key: ${{ runner.os }}-pods-${{ hashFiles('./apps/expo/ios/Podfile.lock') }}
+          path: '**/Pods'
+          key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-pods-
 
       - name: Build iOS app
         run: cd apps/expo && pnpm ipa