diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index b25c5e8..2a099ed 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,24 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-    <component name="GradleMigrationSettings" migrationVersion="1" />
-    <component name="GradleSettings">
-        <option name="linkedExternalProjectsSettings">
-            <GradleProjectSettings>
-                <option name="testRunner" value="GRADLE" />
-                <option name="distributionType" value="DEFAULT_WRAPPED" />
-                <option name="externalProjectPath" value="$PROJECT_DIR$" />
-                <option name="modules">
-                    <set>
-                        <option value="$PROJECT_DIR$" />
-                        <option value="$PROJECT_DIR$/application" />
-                        <option value="$PROJECT_DIR$/buildSrc" />
-                        <option value="$PROJECT_DIR$/mltest" />
-                        <option value="$PROJECT_DIR$/recorder" />
-                        <option value="$PROJECT_DIR$/sensorlib" />
-                        <option value="$PROJECT_DIR$/wear" />
-                    </set>
-                </option>
-            </GradleProjectSettings>
+  <component name="GradleMigrationSettings" migrationVersion="1" />
+  <component name="GradleSettings">
+    <option name="linkedExternalProjectsSettings">
+      <GradleProjectSettings>
+        <option name="testRunner" value="GRADLE" />
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="jbr-17" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/application" />
+            <option value="$PROJECT_DIR$/buildSrc" />
+            <option value="$PROJECT_DIR$/mltest" />
+            <option value="$PROJECT_DIR$/recorder" />
+            <option value="$PROJECT_DIR$/sensorlib" />
+            <option value="$PROJECT_DIR$/wear" />
+          </set>
         </option>
-    </component>
-</project>
+      </GradleProjectSettings>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 773fe0f..8978d23 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/build.gradle b/build.gradle
index 0611a8c..2e20cca 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,5 +5,6 @@ plugins {
     alias libs.plugins.kotlinPlugin apply false
     alias libs.plugins.junit5Plugin apply false
     alias libs.plugins.ktlintPlugin apply false
+    alias libs.plugins.kspPlugin apply false
     alias libs.plugins.versionsPlugin apply false
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 63b6d6a..37ea17e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,9 +1,9 @@
 [versions]
-core_ktx = '1.9.0'
-coroutines_android = '1.6.4'
-junit5 = '5.9.2'
-mockk = '1.13.4'
-truth = '1.1.3'
+core_ktx = '1.10.1'
+coroutines_android = '1.7.3'
+junit5 = '5.10.0'
+mockk = '1.13.5'
+truth = '1.1.5'
 lifecycle_runtime = '2.6.0-beta01'
 play_services_wearable = '18.0.0'
 legacy_support_v4 = '1.0.0'
@@ -11,16 +11,18 @@ compose = '1.4.0-beta01'
 wear_compose = '1.2.0-alpha04'
 compose_lifecycle_viewmodel = '2.5.1'
 activity_compose = '1.6.1'
-tflite = '2.11.0'
-room = '2.5.0'
+tflite = '2.13.0'
+room = '2.5.2'
+work_ktx = '2.8.1'
 
 composeCompiler = '1.4.2'
 
-android_plugin = "8.0.0"
+android_plugin = "8.1.2"
 kotlin_plugin = '1.8.10'
 junit5_plugin = '1.8.2.1'
 ktlint_plugin = '11.2.0'
 versions_plugin = '0.45.0'
+ksp_plugin =  '1.8.10-1.0.9'
 
 [libraries]
 core = { module = 'androidx.core:core-ktx', version.ref = 'core_ktx' }
@@ -56,6 +58,8 @@ room-compiler = { module = 'androidx.room:room-compiler', version.ref = 'room' }
 room-kotlin = { module = 'androidx.room:room-ktx', version.ref = 'room' }
 room-testing = { module = 'androidx.room:room-testing', version.ref = 'room' }
 
+work = { module = 'androidx.work:work-runtime-ktx', version.ref = 'work_ktx'}
+
 [bundles]
 tflite = ['tflite-core', 'tflite-gpu', 'tflite-gpuApi']
 
@@ -66,3 +70,4 @@ kotlinPlugin = { id = 'org.jetbrains.kotlin.android', version.ref = 'kotlin_plug
 junit5Plugin = { id = 'de.mannodermaus.android-junit5', version.ref = 'junit5_plugin' }
 ktlintPlugin = { id = 'org.jlleitschuh.gradle.ktlint', version.ref = 'ktlint_plugin' }
 versionsPlugin = { id = 'com.github.ben-manes.versions', version.ref = 'versions_plugin' }
+kspPlugin = { id = 'com.google.devtools.ksp', version.ref = 'ksp_plugin' }
diff --git a/recorder/build.gradle b/recorder/build.gradle
index e420fed..fc6e000 100644
--- a/recorder/build.gradle
+++ b/recorder/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'handmonitor.android-app-wear-conventions'
     id 'handmonitor.android-compose-wear-conventions'
-    id 'kotlin-kapt'
+    id 'com.google.devtools.ksp'
 }
 
 android {
@@ -15,11 +15,10 @@ android {
 }
 
 dependencies {
-    // TODO: Move work version to catalog
-    implementation "androidx.work:work-runtime-ktx:2.8.0"
+    implementation libs.work
     implementation project(path: ":sensorlib")
     implementation libs.room.runtime
-    kapt libs.room.compiler
+    ksp libs.room.compiler
     implementation libs.room.kotlin
     testImplementation libs.room.testing
 }
diff --git a/recorder/src/main/java/com/handmonitor/recorder/database/AppDatabase.kt b/recorder/src/main/java/com/handmonitor/recorder/database/AppDatabase.kt
index e001043..69c0894 100644
--- a/recorder/src/main/java/com/handmonitor/recorder/database/AppDatabase.kt
+++ b/recorder/src/main/java/com/handmonitor/recorder/database/AppDatabase.kt
@@ -25,7 +25,8 @@ import com.handmonitor.recorder.database.dao.RecordingDao
  */
 @Database(
     version = 1,
-    entities = [Recording::class]
+    entities = [Recording::class],
+    exportSchema = false
 )
 abstract class AppDatabase : RoomDatabase() {
     companion object {
diff --git a/wear/build.gradle b/wear/build.gradle
index 4702396..61ab2e8 100644
--- a/wear/build.gradle
+++ b/wear/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'handmonitor.android-app-wear-conventions'
     id 'handmonitor.android-compose-wear-conventions'
-    id 'kotlin-kapt'
+    id 'com.google.devtools.ksp'
 }
 
 android {
@@ -19,7 +19,7 @@ dependencies {
     implementation project(path: ':sensorlib')
     implementation libs.bundles.tflite
     implementation libs.room.runtime
-    kapt libs.room.compiler
+    ksp libs.room.compiler
     implementation libs.room.kotlin
     testImplementation libs.room.testing
 }