diff --git a/analytics/build.gradle b/analytics/build.gradle
index d90d6e918d..e4a0e82607 100644
--- a/analytics/build.gradle
+++ b/analytics/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id "com.android.library"
     id "kotlin-android"
-    id "kotlin-kapt"
+    id 'com.google.devtools.ksp'
 }
 
 android {
diff --git a/app/build.gradle b/app/build.gradle
index 3c507b2755..52cb6214d4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id "com.android.application"
     id "kotlin-android"
-    id "kotlin-kapt"
+    id 'com.google.devtools.ksp'
     alias(libs.plugins.compose.compiler)
     id "com.google.firebase.appdistribution"
 }
@@ -163,8 +163,8 @@ dependencies {
     implementation project(':gallery-experience')
 
     //Compile time dependencies
-    kapt libs.daggerCompiler
-    kapt libs.glideCompiler
+    ksp libs.daggerCompiler
+    ksp libs.glideCompiler
     compileOnly libs.javaxAnnotation
     compileOnly libs.javaxInject
 
diff --git a/build.gradle b/build.gradle
index 48b7700eae..65a8aad439 100644
--- a/build.gradle
+++ b/build.gradle
@@ -46,6 +46,7 @@ plugins {
     alias(libs.plugins.dokka) apply false
     alias(libs.plugins.firebaseDistribution) apply false
     alias(libs.plugins.gms) apply false
+    alias(libs.plugins.ksp) apply false
 }
 
 def testDebugAll = tasks.create("testDebugAll")
diff --git a/core-utils/build.gradle b/core-utils/build.gradle
index 7f59c8ec44..2bc2793066 100644
--- a/core-utils/build.gradle
+++ b/core-utils/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id "com.android.library"
     id "kotlin-android"
-    id "kotlin-kapt"
+    id "com.google.devtools.ksp"
 }
 
 android {
@@ -18,7 +18,7 @@ android {
 
 dependencies {
 
-    kapt libs.daggerCompiler
+    ksp libs.daggerCompiler
 
     implementation libs.appcompat
 
diff --git a/gradle.properties b/gradle.properties
index 86e51a003d..1f450ab5f6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,7 +20,6 @@ android.enableJetifier=false
 
 kotlin.code.style=official
 
-kapt.incremental.apt=true
 org.gradle.unsafe.configuration-cache=true
 
 android.enableR8.fullMode=false
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d3ebd96bfc..7aba58cb2d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,6 +1,7 @@
 [versions]
 middlewareVersion = "v0.34.3"
 kotlinVersion = '2.0.0'
+kspVersion = "2.0.0-1.0.22"
 
 androidxCoreVersion = "1.13.1"
 
@@ -181,5 +182,5 @@ dokka = { id = "org.jetbrains.dokka", version.ref = "dokkaVersion" }
 kserialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlinVersion" }
 wire = { id = "com.squareup.wire", version = "4.9.8" }
 firebaseDistribution = { id = "com.google.firebase.appdistribution", version = "5.0.0" }
-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlinVersion" }
+ksp = { id = "com.google.devtools.ksp", version.ref = "kspVersion" }
 gms = { id = "com.google.gms.google-services", version = "4.4.2" }
\ No newline at end of file
diff --git a/localization/build.gradle b/localization/build.gradle
index 28219f6d35..09847dff9a 100644
--- a/localization/build.gradle
+++ b/localization/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id "com.android.library"
     id "kotlin-android"
-    id "kotlin-kapt"
+    id "com.google.devtools.ksp"
 }
 
 dependencies {
diff --git a/middleware/build.gradle b/middleware/build.gradle
index 87ac892d65..eb6aecc0e5 100644
--- a/middleware/build.gradle
+++ b/middleware/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id "com.android.library"
     id "kotlin-android"
-    id "kotlin-kapt"
+    id "com.google.devtools.ksp"
 }
 
 dependencies {
diff --git a/persistence/build.gradle b/persistence/build.gradle
index 0b205aacea..04acbb76b7 100644
--- a/persistence/build.gradle
+++ b/persistence/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id "com.android.library"
     id "kotlin-android"
-    id "kotlin-kapt"
+    id "com.google.devtools.ksp"
     id "kotlinx-serialization"
     id "com.squareup.wire"
 }
@@ -21,7 +21,7 @@ dependencies {
     implementation libs.roomKtx
     implementation libs.dataStore
 
-    kapt libs.annotations
+    ksp libs.annotations
 
     implementation libs.timber
 
diff --git a/presentation/build.gradle b/presentation/build.gradle
index 6c909769e1..8a99c6cab1 100644
--- a/presentation/build.gradle
+++ b/presentation/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id "com.android.library"
     id "kotlin-android"
-    id "kotlin-kapt"
+    id "com.google.devtools.ksp"
     id "kotlin-parcelize"
 }
 
diff --git a/sample/build.gradle b/sample/build.gradle
index 4a16d39b3c..46a04c3126 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id "com.android.application"
     id "kotlin-android"
-    id "kotlin-kapt"
+    id "com.google.devtools.ksp"
     alias(libs.plugins.compose.compiler)
     id 'com.google.gms.google-services'
 }