diff --git a/android/build.gradle.kts b/android/build.gradle.kts
index b1da3713..25e97a13 100644
--- a/android/build.gradle.kts
+++ b/android/build.gradle.kts
@@ -1,14 +1,19 @@
 @file:Suppress("DSL_SCOPE_VIOLATION", "UnstableApiUsage")
 
+import dagger.hilt.android.plugin.HiltExtension
+
 plugins {
   id("dev.msfjarvis.claw.android-application")
   id("dev.msfjarvis.claw.rename-artifacts")
   id("dev.msfjarvis.claw.kotlin-android")
-  id("dev.msfjarvis.claw.kotlin-kapt")
   id("dev.msfjarvis.claw.versioning-plugin")
   alias(libs.plugins.hilt)
+  alias(libs.plugins.napt)
 }
 
+// Hilt's aggregating task fails with NAPT
+extensions.getByType<HiltExtension>().enableAggregatingTask = false
+
 android {
   namespace = "dev.msfjarvis.claw.android"
   defaultConfig { applicationId = "dev.msfjarvis.claw.android" }
@@ -34,8 +39,8 @@ android {
 }
 
 dependencies {
-  kapt(libs.androidx.hilt.compiler)
-  kapt(libs.dagger.hilt.compiler)
+  annotationProcessor(libs.androidx.hilt.compiler)
+  annotationProcessor(libs.dagger.hilt.compiler)
   implementation(projects.api)
   implementation(projects.common)
   implementation(projects.coroutineUtils)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 233d0b4b..3f5255c9 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -86,3 +86,4 @@ testparameterinjector = "com.google.testparameterinjector:test-parameter-injecto
 android-test = { id = "com.android.test", version.ref = "agp" }
 hilt = { id = "com.google.dagger.hilt.android", version.ref = "dagger" }
 sqldelight = { id = "app.cash.sqldelight", version.ref = "sqldelight" }
+napt = { id = "com.sergei-lapin.napt", version = "1.17" }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 747d71ab..145a0eea 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -33,6 +33,8 @@ pluginManagement {
         includeModule("com.github.ben-manes", "gradle-versions-plugin")
         includeModule("org.gradle.android.cache-fix", "org.gradle.android.cache-fix.gradle.plugin")
         includeModule("gradle.plugin.org.gradle.android", "android-cache-fix-gradle-plugin")
+        includeModule("com.sergei-lapin.napt", "com.sergei-lapin.napt.gradle.plugin")
+        includeModule("com.sergei-lapin.napt", "gradle")
       }
     }
     includeBuild("build-logic")