diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 57950c5b..eede1265 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -245,6 +245,15 @@ jobs:
           bundler-cache: true
           working-directory: 'android'
 
+      - name: Clean up disk space
+        run: |
+          echo "Disk space before cleanup:"
+          df -h
+          sudo rm -rf /usr/share/dotnet /opt/ghc || true
+          rm -rf ~/.dart_tool ~/.pub-cache || true
+          echo "Disk space after cleanup:"
+          df -h
+
       - name: Install Project Dependencies
         run: flutter pub get
 
diff --git a/.github/workflows/pull_requests.yml b/.github/workflows/pull_requests.yml
index 3712a3cc..1333231e 100644
--- a/.github/workflows/pull_requests.yml
+++ b/.github/workflows/pull_requests.yml
@@ -183,6 +183,15 @@ jobs:
           bundler-cache: true
           working-directory: 'android'
 
+      - name: Clean up disk space
+        run: |
+          echo "Disk space before cleanup:"
+          df -h
+          sudo rm -rf /usr/share/dotnet /opt/ghc || true
+          rm -rf ~/.dart_tool ~/.pub-cache || true
+          echo "Disk space after cleanup:"
+          df -h
+
       - name: Install Project Dependencies
         run: flutter pub get
 
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 3705e28d..e8149ade 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -3,27 +3,7 @@ plugins {
     id "org.jetbrains.kotlin.android"
     id "dev.flutter.flutter-gradle-plugin"
 }
-// Force older AndroidX core libs so they work with AGP 8.6.x
-configurations.all {
-    resolutionStrategy.eachDependency { details ->
-        if (details.requested.group == "androidx.core"
-                && (details.requested.name == "core" || details.requested.name == "core-ktx")) {
-            // 1.13.1 is pre 1.15/1.17 AAR-metadata strictness
-            details.useVersion "1.13.1"
-            details.because("Flutter 3.38 uses AGP 8.6.x, so we avoid androidx.core 1.17.0 which requires AGP 8.9.1")
-        }
-        if (details.requested.group == "androidx.browser"
-                && details.requested.name == "browser") {
-            details.useVersion "1.8.0"
-            details.because("Avoid androidx.browser 1.9.0 which requires AGP 8.9.1 while Flutter pins 8.6.x")
-        }
-        if (details.requested.group == "net.bytebuddy"
-                && details.requested.name == "byte-buddy") {
-            details.useVersion "1.14.10"
-            details.because("Avoid byte-buddy 1.17.6 which Jetifier cannot transform (unsupported class file major version 68)")
-        }
-    }
-}
+
 def localProperties = new Properties()
 def localPropertiesFile = rootProject.file('local.properties')
 if (localPropertiesFile.exists()) {
diff --git a/android/gradle.properties b/android/gradle.properties
index ec746cc6..12f6b450 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -3,5 +3,4 @@ org.gradle.parallel=true
 org.gradle.caching=true
 org.gradle.daemon=true
 android.useAndroidX=true
-android.enableJetifier=false
-android.useDeprecatedNdk=true
\ No newline at end of file
+android.enableJetifier=true
\ No newline at end of file
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index efdcc4ac..6388f318 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-all.zip
diff --git a/android/settings.gradle b/android/settings.gradle
index 600b2919..0a9ff8bf 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -18,9 +18,9 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "org.jetbrains.kotlin.android" version "2.1.0" apply false
-    id 'com.android.application' version '8.9.1' apply false
-    id 'com.android.library' version '8.9.1' apply false
+    id "org.jetbrains.kotlin.android" version "2.2.20" apply false
+    id 'com.android.application' version '8.13.2' apply false
+    id 'com.android.library' version '8.13.2' apply false
 }
 
 include ':app'
\ No newline at end of file