diff --git a/.circleci/config.yml b/.circleci/config.yml
index b84cfb92..2bb8aa1c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,7 +1,7 @@
 version: 2.1
 orbs:
   codecov: codecov/codecov@5.4.3
-  ruby: circleci/ruby@2.0.0
+  ruby: circleci/ruby@2.5.3
 
 commands:
   restore_gradle_cache:
@@ -10,10 +10,11 @@ commands:
           key: v1-gradle-wrapper-{{ arch }}-{{ checksum "gradle/wrapper/gradle-wrapper.properties" }}
       - restore_cache:
           key: v1-gradle-cache-{{ arch }}-{{ checksum "build.gradle.kts" }}-{{ checksum "settings.gradle.kts" }}-{{ checksum "gradle.properties" }}-{{ checksum "app/build.gradle.kts" }}-{{ checksum "gradle/libs.versions.toml" }}
+
   restore_bundler_cache:
     steps:
       - restore_cache:
-          key: v1-bundler-cache-{{ checksum "Gemfile.lock" }}
+          key: v1-bundler-cache-{{ arch }}-{{ checksum "Gemfile.lock" }}
 
   save_gradle_cache:
     steps:
@@ -25,6 +26,7 @@ commands:
           paths:
             - ~/.gradle/caches
           key: v1-gradle-cache-{{ arch }}-{{ checksum "build.gradle.kts" }}-{{ checksum "settings.gradle.kts" }}-{{ checksum "gradle.properties" }}-{{ checksum "app/build.gradle.kts" }}-{{ checksum "gradle/libs.versions.toml" }}
+
   save_bundler_cache:
     steps:
       - save_cache:
@@ -32,34 +34,38 @@ commands:
             - vendor/bundle
           key: v1-bundler-cache-{{ checksum "Gemfile.lock" }}
 
+  setup_android:
+    steps:
+      - checkout
+      - restore_gradle_cache
+      - restore_bundler_cache
+
 executors:
   android-machine:
     machine:
-      image: android:2024.01.1
+      image: android:2024.11.1
   android-docker:
     docker:
-      - image: cimg/android:2024.01
+      - image: cimg/android:2025.04
 
 jobs:
   android-test:
     executor: android-machine
     resource_class: large
     steps:
-      - checkout
-      - restore_gradle_cache
-      - restore_bundler_cache
+      - setup_android
       - ruby/install-deps:
           with-cache: true
       - run:
           name: Fastlane - run all tests with coverage report
           command: |
             bundle exec fastlane testDev
-            bundle exec fastlane lint
+      - run: ./gradlew lintDebug
       - save_gradle_cache
       - save_bundler_cache
       - run:
           name: Analyze on SonarCloud
-          command: ./gradlew lintDebug sonar
+          command: ./gradlew sonar
       - codecov/upload:
           files: app/build/mergedReportDir/jacocoTestReport/jacocoTestReport.xml
       - store_test_results:
@@ -71,14 +77,15 @@ jobs:
     executor: android-docker
     resource_class: large
     steps:
-      - checkout
-      - restore_gradle_cache
+      - setup_android
       - run:
           name: Prepare Fastlane
           command: sudo bundle update
       - run:
           name: Distribute to Firebase AppTester Dev
           command: bundle exec fastlane distDev
+      - save_gradle_cache
+      - save_bundler_cache
       - store_artifacts:
           path: /home/circleci/project/app/build/outputs/apk/debug/app-debug.apk
           destination: fastlane-output-debug
@@ -87,8 +94,7 @@ jobs:
     executor: android-docker
     resource_class: large
     steps:
-      - checkout
-      - restore_gradle_cache
+      - setup_android
       - run:
           name: Prepare Fastlane
           command: sudo bundle update
@@ -98,6 +104,8 @@ jobs:
       - run:
           name: Distribute to Firebase AppTester Prod
           command: bundle exec fastlane distProd
+      - save_gradle_cache
+      - save_bundler_cache
       - store_artifacts:
           path: /home/circleci/project/app/build/outputs/bundle/release/app-release.aab
           destination: fastlane-output-release
@@ -108,4 +116,7 @@ workflows:
       - android-test:
           context: SonarCloud
       - distribute-dev
-      - distribute-internal-testing
+      - distribute-internal-testing:
+          requires:
+            - android-test
+
diff --git a/Gemfile.lock b/Gemfile.lock
index 4ec9b032..9b2175e4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -10,8 +10,8 @@ GEM
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1125.0)
-    aws-sdk-core (3.226.2)
+    aws-partitions (1.1131.0)
+    aws-sdk-core (3.226.3)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
@@ -21,7 +21,7 @@ GEM
     aws-sdk-kms (1.106.0)
       aws-sdk-core (~> 3, >= 3.225.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.192.0)
+    aws-sdk-s3 (1.193.0)
       aws-sdk-core (~> 3, >= 3.225.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
@@ -164,13 +164,13 @@ GEM
     httpclient (2.9.0)
       mutex_m
     jmespath (1.6.2)
-    json (2.12.2)
+    json (2.13.0)
     jwt (2.10.2)
       base64
     logger (1.7.0)
     mini_magick (4.13.2)
     mini_mime (1.1.5)
-    multi_json (1.15.0)
+    multi_json (1.17.0)
     multipart-post (2.4.1)
     mutex_m (0.3.0)
     nanaimo (0.4.0)
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 8cf3ac62..620c3601 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -33,11 +33,6 @@ platform :android do
     ])
   end
 
-  desc "Runs lint"
-  lane :lint do
-    gradle(task: "lintDebug")
-  end
-
   desc "Deploy to Firebase AppTester Dev channel"
   lane :distDev do
     gradle(tasks: [