diff --git a/health-connect/HealthConnectSample/build.gradle b/health-connect/HealthConnectSample/build.gradle
index 17f4fda5..1535b1ea 100644
--- a/health-connect/HealthConnectSample/build.gradle
+++ b/health-connect/HealthConnectSample/build.gradle
@@ -30,7 +30,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.2.0'
+        classpath 'com.android.tools.build:gradle:8.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/health-platform-v1/HealthPlatformSample/build.gradle b/health-platform-v1/HealthPlatformSample/build.gradle
index 097e02b9..0685c276 100644
--- a/health-platform-v1/HealthPlatformSample/build.gradle
+++ b/health-platform-v1/HealthPlatformSample/build.gradle
@@ -30,7 +30,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.2.0'
+        classpath 'com.android.tools.build:gradle:8.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/health-services/ExerciseSample/build.gradle b/health-services/ExerciseSample/build.gradle
index 68a2606d..23967dc1 100644
--- a/health-services/ExerciseSample/build.gradle
+++ b/health-services/ExerciseSample/build.gradle
@@ -28,7 +28,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.2.0'
+        classpath 'com.android.tools.build:gradle:8.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
 
diff --git a/health-services/ExerciseSampleCompose/gradle/libs.versions.toml b/health-services/ExerciseSampleCompose/gradle/libs.versions.toml
index 68619e03..404e9caf 100644
--- a/health-services/ExerciseSampleCompose/gradle/libs.versions.toml
+++ b/health-services/ExerciseSampleCompose/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-android-gradle-plugin = "8.2.0"
+android-gradle-plugin = "8.2.1"
 androidx-activity = "1.8.2"
 androidx-compose = "1.5.4"
 androidx-lifecycle = "2.6.2"
@@ -11,7 +11,7 @@ horologist = "0.5.17"
 org-jetbrains-kotlin = "1.9.21"
 
 [libraries]
-android-lint-gradle = "com.android.tools.lint:lint-gradle:31.2.0"
+android-lint-gradle = "com.android.tools.lint:lint-gradle:31.2.1"
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity" }
 androidx-compose-navigation = "androidx.navigation:navigation-compose:2.7.6"
 androidx-compose-runtime = "androidx.compose.runtime:runtime:1.5.4"
diff --git a/health-services/MeasureData/build.gradle b/health-services/MeasureData/build.gradle
index f9bea3a3..fe8a6055 100644
--- a/health-services/MeasureData/build.gradle
+++ b/health-services/MeasureData/build.gradle
@@ -26,7 +26,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.2.0'
+        classpath 'com.android.tools.build:gradle:8.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
 
diff --git a/health-services/MeasureDataCompose/gradle/libs.versions.toml b/health-services/MeasureDataCompose/gradle/libs.versions.toml
index 1a12bc9e..48f999cb 100644
--- a/health-services/MeasureDataCompose/gradle/libs.versions.toml
+++ b/health-services/MeasureDataCompose/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 accompanist-permissions = "0.32.0"
-android-gradle-plugin = "8.2.0"
+android-gradle-plugin = "8.2.1"
 androidx-activity = "1.8.2"
 androidx-lifecycle = "2.6.2"
 androidx-wear-compose = "1.2.1"
@@ -15,7 +15,7 @@ org-jetbrains-kotlinx = "1.6.0"
 
 [libraries]
 accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist-permissions" }
-android-lint-gradle = "com.android.tools.lint:lint-gradle:31.2.0"
+android-lint-gradle = "com.android.tools.lint:lint-gradle:31.2.1"
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity" }
 androidx-health-services = { module = "androidx.health:health-services-client", version.ref = "health-services" }
 androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" }
diff --git a/health-services/PassiveData/build.gradle b/health-services/PassiveData/build.gradle
index de46d8df..2de1e713 100644
--- a/health-services/PassiveData/build.gradle
+++ b/health-services/PassiveData/build.gradle
@@ -26,7 +26,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.2.0'
+        classpath 'com.android.tools.build:gradle:8.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
 
diff --git a/health-services/PassiveDataCompose/gradle/libs.versions.toml b/health-services/PassiveDataCompose/gradle/libs.versions.toml
index e4d5fb82..1390711e 100644
--- a/health-services/PassiveDataCompose/gradle/libs.versions.toml
+++ b/health-services/PassiveDataCompose/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 accompanist-permissions = "0.32.0"
-android-gradle-plugin = "8.2.0"
+android-gradle-plugin = "8.2.1"
 androidx-activity = "1.8.2"
 androidx-datastore = "1.0.0"
 androidx-lifecycle = "2.6.2"
@@ -19,7 +19,7 @@ org-jetbrains-kotlinx = "1.6.0"
 
 [libraries]
 accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist-permissions" }
-android-lint-gradle = "com.android.tools.lint:lint-gradle:31.2.0"
+android-lint-gradle = "com.android.tools.lint:lint-gradle:31.2.1"
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity" }
 androidx-datastore = { module = "androidx.datastore:datastore-preferences", version.ref = "androidx-datastore" }
 androidx-health-services = { module = "androidx.health:health-services-client", version.ref = "health-services" }
diff --git a/health-services/PassiveGoals/build.gradle b/health-services/PassiveGoals/build.gradle
index f032a1cd..6592d744 100644
--- a/health-services/PassiveGoals/build.gradle
+++ b/health-services/PassiveGoals/build.gradle
@@ -27,7 +27,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.2.0'
+        classpath 'com.android.tools.build:gradle:8.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
 
diff --git a/health-services/PassiveGoalsCompose/gradle/libs.versions.toml b/health-services/PassiveGoalsCompose/gradle/libs.versions.toml
index e4d5fb82..1390711e 100644
--- a/health-services/PassiveGoalsCompose/gradle/libs.versions.toml
+++ b/health-services/PassiveGoalsCompose/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 accompanist-permissions = "0.32.0"
-android-gradle-plugin = "8.2.0"
+android-gradle-plugin = "8.2.1"
 androidx-activity = "1.8.2"
 androidx-datastore = "1.0.0"
 androidx-lifecycle = "2.6.2"
@@ -19,7 +19,7 @@ org-jetbrains-kotlinx = "1.6.0"
 
 [libraries]
 accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist-permissions" }
-android-lint-gradle = "com.android.tools.lint:lint-gradle:31.2.0"
+android-lint-gradle = "com.android.tools.lint:lint-gradle:31.2.1"
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity" }
 androidx-datastore = { module = "androidx.datastore:datastore-preferences", version.ref = "androidx-datastore" }
 androidx-health-services = { module = "androidx.health:health-services-client", version.ref = "health-services" }