diff --git a/build.gradle.kts b/build.gradle.kts
index 7c0fafc5f..7816c1e66 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     alias(libs.plugins.agp) apply false
     alias(libs.plugins.kotlin.android) apply false
-    alias(libs.plugins.kotlin.kapt) apply false
+    alias(libs.plugins.ksp) apply false
     alias(libs.plugins.ktlint.plugin) apply false
     alias(libs.plugins.shadow) apply false
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 39e86f1e8..d245535d6 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "8.6.1"
+agp = "8.8.0"
 annotation = "1.9.1"
 appcompat = "1.7.0"
 appintro = "6.3.1"
@@ -21,6 +21,7 @@ konfetti-xml = "2.0.2"
 kotlin = "2.1.10"
 kotlin-css-jvm = "1.0.0-pre.148-kotlin-1.4.30"
 kotlinxCoroutinesCoreCommon = "1.3.8"
+ksp = "2.1.10-1.0.30"
 ktlint-plugin = "11.6.1"
 ktor = "1.6.8"
 ktxCoroutine = "1.10.1"
@@ -87,17 +88,17 @@ uiautomator = { group = "androidx.test.uiautomator", name = "uiautomator", versi
 
 [bundles]
 androidTest = [
-    "espresso-contrib",
-    "espresso-core",
+    "annotation",
     "dagger",
     "dexmaker-mockito",
+    "espresso-contrib",
+    "espresso-core",
+    "junit",
     "ktor-client-mock",
     "ktor-jackson",
-    "annotation",
-    "junit",
-    "uiautomator",
-    "rules",
     "mockito-kotlin",
+    "rules",
+    "uiautomator"
 ]
 test = [
     "dagger",
@@ -108,6 +109,6 @@ test = [
 [plugins]
 agp = { id = "com.android.application", version.ref = "agp" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
-kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
+ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 ktlint-plugin = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint-plugin" }
 shadow = { id = "com.github.johnrengelman.shadow", version.ref = "shadow" }
\ No newline at end of file
diff --git a/uhabits-android/build.gradle.kts b/uhabits-android/build.gradle.kts
index 41e2f666b..20ae36b66 100644
--- a/uhabits-android/build.gradle.kts
+++ b/uhabits-android/build.gradle.kts
@@ -20,7 +20,7 @@
 plugins {
     alias(libs.plugins.agp)
     alias(libs.plugins.kotlin.android)
-    alias(libs.plugins.kotlin.kapt)
+    alias(libs.plugins.ksp)
     alias(libs.plugins.ktlint.plugin)
 }
 
@@ -89,8 +89,6 @@ android {
     lint.abortOnError = false
 }
 
-kapt.correctErrorTypes = true
-
 dependencies {
     compileOnly(libs.jsr250.api)
     coreLibraryDesugaring(libs.desugar.jdk.libs)
@@ -112,8 +110,7 @@ dependencies {
     implementation(libs.opencsv)
     implementation(libs.konfetti.xml)
     implementation(project(":uhabits-core"))
-    kapt(libs.dagger.compiler)
-    kaptAndroidTest(libs.dagger.compiler)
+    ksp(libs.dagger.compiler)
 
     androidTestImplementation(libs.bundles.androidTest)
     testImplementation(libs.bundles.test)