diff --git a/health-connect/HealthConnectSample/app/build.gradle b/health-connect/HealthConnectSample/app/build.gradle
index 60e500ad..a9517eb1 100644
--- a/health-connect/HealthConnectSample/app/build.gradle
+++ b/health-connect/HealthConnectSample/app/build.gradle
@@ -53,7 +53,7 @@ android {
         compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.7"
+        kotlinCompilerExtensionVersion = "1.5.8"
     }
     packagingOptions {
         resources {
diff --git a/health-connect/HealthConnectSample/build.gradle b/health-connect/HealthConnectSample/build.gradle
index 4b3e46de..758ce15c 100644
--- a/health-connect/HealthConnectSample/build.gradle
+++ b/health-connect/HealthConnectSample/build.gradle
@@ -15,7 +15,7 @@
  */
 
 buildscript {
-    ext.kotlin_version = '1.9.21'
+    ext.kotlin_version = '1.9.22'
     ext {
         activity_compose_version = '1.8.2'
         hilt_navigation_compose_version = '1.0.0'
diff --git a/health-platform-v1/HealthPlatformSample/app/build.gradle b/health-platform-v1/HealthPlatformSample/app/build.gradle
index aa5c965f..56be3aeb 100644
--- a/health-platform-v1/HealthPlatformSample/app/build.gradle
+++ b/health-platform-v1/HealthPlatformSample/app/build.gradle
@@ -59,7 +59,7 @@ android {
         compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.7"
+        kotlinCompilerExtensionVersion = "1.5.8"
     }
     packagingOptions {
         resources {
diff --git a/health-platform-v1/HealthPlatformSample/build.gradle b/health-platform-v1/HealthPlatformSample/build.gradle
index f38ff57f..c57cdf67 100644
--- a/health-platform-v1/HealthPlatformSample/build.gradle
+++ b/health-platform-v1/HealthPlatformSample/build.gradle
@@ -15,7 +15,7 @@
  */
 
 buildscript {
-    ext.kotlin_version = '1.9.21'
+    ext.kotlin_version = '1.9.22'
     ext {
         activity_compose_version = '1.8.2'
         hilt_navigation_compose_version = '1.1.0'
diff --git a/health-services/ExerciseSample/build.gradle b/health-services/ExerciseSample/build.gradle
index 87474a53..13c9cc80 100644
--- a/health-services/ExerciseSample/build.gradle
+++ b/health-services/ExerciseSample/build.gradle
@@ -17,7 +17,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     ext {
-        kotlin_version = "1.9.21"
+        kotlin_version = "1.9.22"
         hilt_version = '2.50'
         lifecycle_version = "2.7.0"
     }
diff --git a/health-services/ExerciseSampleCompose/gradle/libs.versions.toml b/health-services/ExerciseSampleCompose/gradle/libs.versions.toml
index f17a230a..cf40eb5a 100644
--- a/health-services/ExerciseSampleCompose/gradle/libs.versions.toml
+++ b/health-services/ExerciseSampleCompose/gradle/libs.versions.toml
@@ -8,7 +8,7 @@ core-splashscreen = "1.0.1"
 dagger = "2.50"
 health-services = "1.0.0-rc01"
 horologist = "0.5.19"
-org-jetbrains-kotlin = "1.9.21"
+org-jetbrains-kotlin = "1.9.22"
 
 [libraries]
 android-lint-gradle = "com.android.tools.lint:lint-gradle:31.2.1"
@@ -27,7 +27,7 @@ androidx-lifecycle-service = {module = "androidx.lifecycle:lifecycle-service", v
 androidx-lifecycle-viewmodel = {module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle"}
 androidx-material-icons-extended = { module = "androidx.compose.material:material-icons-extended", version.ref = "androidx-compose" }
 androidx-wear = "androidx.wear:wear:1.3.0"
-compose-compiler = "androidx.compose.compiler:compiler:1.5.7"
+compose-compiler = "androidx.compose.compiler:compiler:1.5.8"
 compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "androidx-compose" }
 compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "androidx-compose" }
 compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "androidx-compose" }
diff --git a/health-services/MeasureData/build.gradle b/health-services/MeasureData/build.gradle
index fe8a6055..55f1f284 100644
--- a/health-services/MeasureData/build.gradle
+++ b/health-services/MeasureData/build.gradle
@@ -17,7 +17,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     ext {
-        kotlin_version = '1.9.21'
+        kotlin_version = '1.9.22'
         hilt_version = '2.50'
         lifecycle_version = '2.3.1'
     }
diff --git a/health-services/MeasureDataCompose/gradle/libs.versions.toml b/health-services/MeasureDataCompose/gradle/libs.versions.toml
index 9d084e39..7a7f4513 100644
--- a/health-services/MeasureDataCompose/gradle/libs.versions.toml
+++ b/health-services/MeasureDataCompose/gradle/libs.versions.toml
@@ -5,12 +5,12 @@ androidx-activity = "1.8.2"
 androidx-lifecycle = "2.7.0"
 androidx-wear-compose = "1.2.1"
 compose = "1.5.4"
-compose-compiler = "1.5.7"
+compose-compiler = "1.5.8"
 concurrent-futures = "1.1.0"
 guava = "33.0.0-android"
 health-services = "1.0.0-rc01"
 ktlint = "0.46.1"
-org-jetbrains-kotlin = "1.9.21"
+org-jetbrains-kotlin = "1.9.22"
 org-jetbrains-kotlinx = "1.6.0"
 
 [libraries]
diff --git a/health-services/PassiveData/build.gradle b/health-services/PassiveData/build.gradle
index 68cbaa3a..0de373c7 100644
--- a/health-services/PassiveData/build.gradle
+++ b/health-services/PassiveData/build.gradle
@@ -17,7 +17,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     ext {
-        kotlin_version = '1.9.21'
+        kotlin_version = '1.9.22'
         hilt_version = '2.50'
         lifecycle_version = '2.7.0'
     }
diff --git a/health-services/PassiveDataCompose/gradle/libs.versions.toml b/health-services/PassiveDataCompose/gradle/libs.versions.toml
index 3ee67c8e..57637463 100644
--- a/health-services/PassiveDataCompose/gradle/libs.versions.toml
+++ b/health-services/PassiveDataCompose/gradle/libs.versions.toml
@@ -9,12 +9,12 @@ androidx-wear-tiles = "1.0.1"
 androidx-wear-watchface = "1.0.1"
 androidx-work = "2.9.0"
 compose = "1.5.4"
-compose-compiler = "1.5.7"
+compose-compiler = "1.5.8"
 concurrent-futures = "1.1.0"
 guava = "33.0.0-android"
 health-services = "1.0.0-rc01"
 ktlint = "0.46.1"
-org-jetbrains-kotlin = "1.9.21"
+org-jetbrains-kotlin = "1.9.22"
 org-jetbrains-kotlinx = "1.6.0"
 
 [libraries]
diff --git a/health-services/PassiveGoals/build.gradle b/health-services/PassiveGoals/build.gradle
index de0c9f09..9e6a36a2 100644
--- a/health-services/PassiveGoals/build.gradle
+++ b/health-services/PassiveGoals/build.gradle
@@ -17,7 +17,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     ext {
-        kotlin_version = "1.9.21"
+        kotlin_version = "1.9.22"
         hilt_version = '2.50'
         lifecycle_version = "2.7.0"
     }
diff --git a/health-services/PassiveGoalsCompose/gradle/libs.versions.toml b/health-services/PassiveGoalsCompose/gradle/libs.versions.toml
index 3ee67c8e..57637463 100644
--- a/health-services/PassiveGoalsCompose/gradle/libs.versions.toml
+++ b/health-services/PassiveGoalsCompose/gradle/libs.versions.toml
@@ -9,12 +9,12 @@ androidx-wear-tiles = "1.0.1"
 androidx-wear-watchface = "1.0.1"
 androidx-work = "2.9.0"
 compose = "1.5.4"
-compose-compiler = "1.5.7"
+compose-compiler = "1.5.8"
 concurrent-futures = "1.1.0"
 guava = "33.0.0-android"
 health-services = "1.0.0-rc01"
 ktlint = "0.46.1"
-org-jetbrains-kotlin = "1.9.21"
+org-jetbrains-kotlin = "1.9.22"
 org-jetbrains-kotlinx = "1.6.0"
 
 [libraries]