diff --git a/components/gradle.properties b/components/gradle.properties
index bacdef52520..95dcb9a8c5e 100644
--- a/components/gradle.properties
+++ b/components/gradle.properties
@@ -8,7 +8,7 @@ android.useAndroidX=true
 
 #Versions
 kotlin.version=1.9.24
-agp.version=8.2.2
+agp.version=8.7.0
 compose.version=1.8.0-alpha01
 deploy.version=0.1.0-SNAPSHOT
 
diff --git a/components/gradle/wrapper/gradle-wrapper.properties b/components/gradle/wrapper/gradle-wrapper.properties
index a5952066425..19cfad969ba 100644
--- a/components/gradle/wrapper/gradle-wrapper.properties
+++ b/components/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists