diff --git a/app/build.gradle b/app/build.gradle
index eafd3c1ac..02863791f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,7 +6,7 @@ plugins {
     id 'com.google.dagger.hilt.android'
     id 'de.mobilej.unmock'
     id 'com.google.protobuf'
-    id 'kotlin-kapt'
+    id "com.google.devtools.ksp"
 }
 
 unMock {
@@ -154,7 +154,7 @@ dependencies {
     def room_version = '2.5.2'
     implementation "androidx.room:room-runtime:$room_version"
     annotationProcessor "androidx.room:room-compiler:$room_version"
-    kapt "androidx.room:room-compiler:$room_version"
+    ksp "androidx.room:room-compiler:$room_version"
     // optional - Kotlin Extensions and Coroutines support for Room
     implementation "androidx.room:room-ktx:$room_version"
     // optional - Test helpers
@@ -163,7 +163,7 @@ dependencies {
     // Hilt
     implementation "com.google.dagger:hilt-android:$hilt_version"
     // implementation "androidx.hilt:hilt-navigation-compose:1.0.0"
-    kapt "com.google.dagger:hilt-compiler:$hilt_version"
+    ksp "com.google.dagger:hilt-compiler:$hilt_version"
 
     // Navigation
     def nav_version = "2.7.1"
@@ -246,8 +246,9 @@ dependencies {
     implementation 'com.github.AppIntro:AppIntro:6.3.1'
 }
 
-kapt {
-    correctErrorTypes true
+ksp {
+//    arg("room.generateKotlin", "true")
+    arg("room.schemaLocation", "$projectDir/schemas")
 }
 
 repositories {
diff --git a/build.gradle b/build.gradle
index a3f444e3f..5d170974a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -37,6 +37,10 @@ buildscript {
     }
 }
 
+plugins {
+    id "com.google.devtools.ksp" version "1.9.10-1.0.13" apply false
+}
+
 allprojects {
     repositories {
         google()