diff --git a/compatLib/build.gradle b/compatLib/build.gradle
index 39e1752ab9..e411903668 100644
--- a/compatLib/build.gradle
+++ b/compatLib/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 android {
-    buildToolsVersion "36.1.0"
+    buildToolsVersion "37.0.0"
     namespace "app.lawnchair.compatlib"
 
     buildFeatures {
diff --git a/systemUI/animation/build.gradle b/systemUI/animation/build.gradle
index 34123c04ec..a93ff8b457 100644
--- a/systemUI/animation/build.gradle
+++ b/systemUI/animation/build.gradle
@@ -4,7 +4,7 @@ plugins {
 
 // TODO: Pull out surfaceeffects outside of src and have separate build files there.
 android {
-    buildToolsVersion "36.1.0"
+    buildToolsVersion "37.0.0"
     namespace "com.android.systemui.animation"
     buildFeatures {
         aidl true
diff --git a/systemUI/common/build.gradle b/systemUI/common/build.gradle
index 5b4deda4ef..ea39bbc229 100644
--- a/systemUI/common/build.gradle
+++ b/systemUI/common/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 android {
-    buildToolsVersion "36.1.0"
+    buildToolsVersion "37.0.0"
     namespace "com.android.systemui.common"
 
     sourceSets {
diff --git a/systemUI/log/build.gradle b/systemUI/log/build.gradle
index 544e845eb0..a55df3b12b 100644
--- a/systemUI/log/build.gradle
+++ b/systemUI/log/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 android {
-    buildToolsVersion "36.1.0"
+    buildToolsVersion "37.0.0"
     namespace "com.android.systemui.log"
     buildFeatures {
         aidl true
diff --git a/systemUI/plugin/build.gradle b/systemUI/plugin/build.gradle
index fc3a7daf44..2c87f49a15 100644
--- a/systemUI/plugin/build.gradle
+++ b/systemUI/plugin/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 android {
-    buildToolsVersion "36.1.0"
+    buildToolsVersion "37.0.0"
     namespace "com.android.systemui.plugins"
     buildFeatures {
         aidl true
diff --git a/systemUI/plugin_core/build.gradle b/systemUI/plugin_core/build.gradle
index 87d7d1dc42..19a36242c0 100644
--- a/systemUI/plugin_core/build.gradle
+++ b/systemUI/plugin_core/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 android {
-    buildToolsVersion "36.1.0"
+    buildToolsVersion "37.0.0"
     namespace "com.android.systemui.plugin_core"
     buildFeatures {
         aidl true
diff --git a/systemUI/shared/build.gradle b/systemUI/shared/build.gradle
index cb35face3b..a8f57e3499 100644
--- a/systemUI/shared/build.gradle
+++ b/systemUI/shared/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 android {
-    buildToolsVersion "36.1.0"
+    buildToolsVersion "37.0.0"
     namespace "com.android.systemui.shared"
     buildFeatures {
         aidl true
diff --git a/systemUI/unfold/build.gradle b/systemUI/unfold/build.gradle
index b9a00a222a..457023a83c 100644
--- a/systemUI/unfold/build.gradle
+++ b/systemUI/unfold/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 android {
-    buildToolsVersion "36.1.0"
+    buildToolsVersion "37.0.0"
     namespace "com.android.systemui.unfold"
     buildFeatures {
         aidl true
diff --git a/systemUI/utils/build.gradle b/systemUI/utils/build.gradle
index fb53a944fc..a2d5825a56 100644
--- a/systemUI/utils/build.gradle
+++ b/systemUI/utils/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 android {
-    buildToolsVersion "36.1.0"
+    buildToolsVersion "37.0.0"
     namespace "com.android.systemui.utils"
     sourceSets {
         main {
diff --git a/wmshell/build.gradle b/wmshell/build.gradle
index 83d3929d67..0b208db2c4 100644
--- a/wmshell/build.gradle
+++ b/wmshell/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 android {
-    buildToolsVersion "36.1.0"
+    buildToolsVersion "37.0.0"
     namespace "com.android.wm.shell"
     buildFeatures {
         aidl true