diff --git a/CHANGELOG.md b/CHANGELOG.md
index 44645b3ef..e6974e087 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ Unreleased
 - Support `@AssistedFactory` in code gen for Metro.
 - Add seekable transition support to `AnimatedOverlay`.
 - Add predictive back support to `FullScreenOverlay`.
+- Compile against Android SDK 36.
 
 0.28.1
 ------
diff --git a/build.gradle.kts b/build.gradle.kts
index 15fa6ec53..1c1421b0f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -336,7 +336,7 @@ subprojects {
 
   // Common android config
   val commonAndroidConfig: CommonExtension<*, *, *, *, *, *>.() -> Unit = {
-    compileSdk = 35
+    compileSdk = 36
 
     if (hasCompose) {
       buildFeatures { compose = true }
@@ -361,7 +361,10 @@ subprojects {
     with(extensions.getByType<LibraryExtension>()) {
       commonAndroidConfig()
       defaultConfig { minSdk = 21 }
-      testOptions { targetSdk = 35 }
+      testOptions {
+        // TODO update once robolectric supports it
+        targetSdk = 35
+      }
     }
 
     // Single-variant libraries
diff --git a/samples/bottom-navigation/build.gradle.kts b/samples/bottom-navigation/build.gradle.kts
index ebc1a8af2..30b088e5f 100644
--- a/samples/bottom-navigation/build.gradle.kts
+++ b/samples/bottom-navigation/build.gradle.kts
@@ -14,7 +14,7 @@ android {
   namespace = "com.slack.circuit.sample.navigation"
   defaultConfig {
     minSdk = 21
-    targetSdk = 35
+    targetSdk = 36
   }
   testOptions { unitTests { isIncludeAndroidResources = true } }
 }
diff --git a/samples/counter/apps/build.gradle.kts b/samples/counter/apps/build.gradle.kts
index 2e0f39351..3ba712ea8 100644
--- a/samples/counter/apps/build.gradle.kts
+++ b/samples/counter/apps/build.gradle.kts
@@ -13,7 +13,7 @@ android {
   namespace = "com.slack.circuit.sample.counter.android"
   defaultConfig {
     minSdk = 31 // For the dynamic m3 theme
-    targetSdk = 35
+    targetSdk = 36
   }
 }
 
diff --git a/samples/interop/build.gradle.kts b/samples/interop/build.gradle.kts
index 38d6f850d..84b0cec2e 100644
--- a/samples/interop/build.gradle.kts
+++ b/samples/interop/build.gradle.kts
@@ -11,7 +11,7 @@ android {
   namespace = "com.slack.circuit.sample.interop"
   defaultConfig {
     minSdk = 28
-    targetSdk = 35
+    targetSdk = 36
     versionCode = 1
     versionName = "1"
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
diff --git a/samples/star/apk/build.gradle.kts b/samples/star/apk/build.gradle.kts
index d99dac4af..66769feb1 100644
--- a/samples/star/apk/build.gradle.kts
+++ b/samples/star/apk/build.gradle.kts
@@ -10,7 +10,7 @@ android {
   namespace = "com.slack.circuit.sample.star.apk"
   defaultConfig {
     minSdk = 28
-    targetSdk = 35
+    targetSdk = 36
     versionCode = 1
     versionName = "1"
   }
diff --git a/samples/star/benchmark/build.gradle.kts b/samples/star/benchmark/build.gradle.kts
index 7e7207034..1398d101b 100644
--- a/samples/star/benchmark/build.gradle.kts
+++ b/samples/star/benchmark/build.gradle.kts
@@ -16,7 +16,7 @@ val isCi = providers.environmentVariable("CI").isPresent
 android {
   namespace = "com.circuit.samples.star.benchmark"
   defaultConfig {
-    targetSdk = 35
+    targetSdk = 36
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
   }
 
diff --git a/samples/tutorial/build.gradle.kts b/samples/tutorial/build.gradle.kts
index bdc653f51..824b49196 100644
--- a/samples/tutorial/build.gradle.kts
+++ b/samples/tutorial/build.gradle.kts
@@ -13,7 +13,7 @@ android {
   namespace = "com.slack.circuit.tutorial"
   defaultConfig {
     minSdk = 21
-    targetSdk = 35
+    targetSdk = 36
   }
 }