diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 88de827f8..7594ff388 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,11 +1,12 @@
 @file:Suppress("UnstableApiUsage")
+import com.android.build.api.dsl.ApplicationExtension
 
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 
 plugins {
     id("com.android.application")
-    id("org.jetbrains.kotlin.android")
+//    id("org.jetbrains.kotlin.android")
     id("com.google.devtools.ksp")
     id("androidx.baselineprofile")
     id("org.jetbrains.kotlin.plugin.compose") version "2.3.0"
@@ -24,7 +25,7 @@ kotlin {
     }
 }
 
-android {
+configure<ApplicationExtension> {
     compileSdk = 36
 
     defaultConfig {
@@ -57,7 +58,7 @@ android {
 
     sourceSets {
         // Adds exported schema location as test app assets.
-        getByName("androidTest").assets.srcDir("$projectDir/schemas")
+        getByName("androidTest").assets.directories.add("$projectDir/schemas")
     }
 
 
@@ -83,13 +84,18 @@ android {
             }
 
             // Keep using until AGP 9.0 then research proguard rules to retain debug info for stack traces
-            postprocessing {
-                isRemoveUnusedCode = true
-                isObfuscate = false
-                isOptimizeCode = true
-                isRemoveUnusedResources = true
-                proguardFiles("proguard-rules.pro")
-            }
+            isMinifyEnabled = true
+            isShrinkResources = true
+            proguardFiles("proguard-rules.pro")
+// TODO: removed
+
+//            postprocessing {
+//                isRemoveUnusedCode = true
+//                isObfuscate = false
+//                isOptimizeCode = true
+//                isRemoveUnusedResources = true
+//                proguardFiles("proguard-rules.pro")
+//            }
         }
         debug {
             applicationIdSuffix = ".debug"
diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts
index 17561f838..6074c801a 100644
--- a/benchmarks/build.gradle.kts
+++ b/benchmarks/build.gradle.kts
@@ -1,5 +1,6 @@
 @file:Suppress("UnstableApiUsage")
 import com.android.build.api.dsl.ManagedVirtualDevice
+import com.android.build.api.dsl.TestExtension
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
@@ -15,7 +16,7 @@ kotlin {
     }
 }
 
-android {
+configure<TestExtension> {
     namespace = "com.jerboa.benchmarks"
     compileSdk = 36
 
diff --git a/build.gradle.kts b/build.gradle.kts
index baa0173f9..dad778dd1 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,9 +1,9 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    id("com.android.application") version "8.13.2" apply false
-    id("com.android.library") version "8.13.2" apply false
-    id("com.android.test") version "8.13.2" apply false
+    id("com.android.application") version "9.0.0" apply false
+    id("com.android.library") version "9.0.0" apply false
+    id("com.android.test") version "9.0.0" apply false
     id("org.jetbrains.kotlin.android") version "2.3.0" apply false
     id("org.jmailen.kotlinter") version "5.3.0" apply false
     id("com.google.devtools.ksp") version "2.3.4" apply false
diff --git a/gradle.properties b/gradle.properties
index 7a2472fa2..fedcb4210 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -22,4 +22,6 @@ kotlin.code.style=official
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
 android.nonFinalResIds=false
-org.gradle.configuration-cache=true
\ No newline at end of file
+org.gradle.configuration-cache=true
+
+#android.newDsl=false
\ No newline at end of file