diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 6ed55f2ce..1f421b71c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 agp = "8.2.0"
 agp-tooling = "8.2.0"
-gradle-tooling = "8.5"
+gradle-tooling = "8.5-r4"
 junit-jupiter = "5.10.1"
 kotlin = "1.9.21"
 kotlin-coroutines = "1.7.3"
@@ -137,7 +137,7 @@ tests-mockk = { module = "io.mockk:mockk", version = "1.13.8" }
 
 # Tooling
 tooling-builderModel = { module = "com.android.tools.build:builder-model", version.ref = "agp-tooling" }
-tooling-gradleApi = { module = "org.gradle:gradle-tooling-api", version.ref = "gradle-tooling" }
+tooling-gradleApi = { module = "com.itsaky.androidide.gradle:gradle-tooling-api", version.ref = "gradle-tooling" }
 tooling-slf4j = { module = "org.slf4j:slf4j-api", version = "2.0.9" }
 
 # Classpaths
diff --git a/settings.gradle.kts b/settings.gradle.kts
index f363ed260..5b2f573df 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -43,8 +43,8 @@ dependencyResolutionManagement {
     google()
     mavenCentral()
     maven { url = uri("https://s01.oss.sonatype.org/content/repositories/snapshots/") }
+    maven { url = uri("https://s01.oss.sonatype.org/content/groups/public/") }
     maven { url = uri("https://jitpack.io") }
-    maven { url = uri("https://repo.gradle.org/gradle/libs-releases/") }
   }
 }