diff --git a/build-logic/android-plugins/src/main/kotlin/dev.msfjarvis.claw.android-common.gradle.kts b/build-logic/android-plugins/src/main/kotlin/dev.msfjarvis.claw.android-common.gradle.kts
index 75daf3d6..d2723ac8 100644
--- a/build-logic/android-plugins/src/main/kotlin/dev.msfjarvis.claw.android-common.gradle.kts
+++ b/build-logic/android-plugins/src/main/kotlin/dev.msfjarvis.claw.android-common.gradle.kts
@@ -7,10 +7,10 @@
 import com.android.build.gradle.TestedExtension
 
 extensions.configure<TestedExtension> {
-  setCompileSdkVersion(31)
+  compileSdkVersion = "android-Tiramisu"
   defaultConfig {
     minSdk = 26
-    targetSdk = 31
+    targetSdkPreview = "Tiramisu"
   }
 
   sourceSets {
diff --git a/gradle.properties b/gradle.properties
index ec472998..5df6008a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -53,6 +53,9 @@ android.defaults.buildfeatures.renderscript=false
 android.defaults.buildfeatures.resvalues=false
 android.defaults.buildfeatures.shaders=false
 
+# Disable warning about Tiramisu
+android.suppressUnsupportedCompileSdk=Tiramisu
+
 # Disable warnings about unsupported features, we know what we're doing
 android.suppressUnsupportedOptionWarnings=android.enableR8.fullMode,android.enableResourceOptimizations,android.nonTransitiveRClass,android.suppressUnsupportedOptionWarnings,android.sdk.channel