diff --git a/gradle.properties b/gradle.properties
index a491cc624..bc2dd8082 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ android.suppressUnsupportedOptionWarnings=android.suppressUnsupportedOptionWarni
   android.experimental.lint.version
 
 # Force use of the latest android lint version
-android.experimental.lint.version=8.8.0-alpha01
+android.experimental.lint.version=8.9.0-alpha02
 android.experimental.lint.missingBaselineIsEmptyBaseline=true
 
 # Disable noisy DAGP logs
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index bb426848a..8ecf1eb9e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "8.7.3"
+agp = "8.8.0"
 agpAlpha = "8.9.0-beta01"
 anvil = "0.4.1"
 # Release notes: https://asm.ow2.io/versions.html
@@ -94,7 +94,7 @@ coroutines-core-ij = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core",
 coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test" }
 detekt = { module = "io.gitlab.arturbosch.detekt:detekt-core", version.ref = "detekt" }
 develocity-agent-adapters = "com.gradle:develocity-gradle-plugin-adapters:1.1"
-gradleLints = "androidx.lint:lint-gradle:1.0.0-alpha02"
+gradleLints = "androidx.lint:lint-gradle:1.0.0-alpha03"
 gradlePlugins-anvil = { module = "dev.zacsweers.anvil:gradle-plugin", version.ref = "anvil" }
 gradlePlugins-bugsnag = { module = "com.bugsnag:bugsnag-android-gradle-plugin", version.ref = "bugsnagGradle" }
 gradlePlugins-compose = { module = "org.jetbrains.compose:compose-gradle-plugin", version.ref = "compose-jb-stable" }
diff --git a/platforms/gradle/foundry-gradle-plugin/lint-baseline.xml b/platforms/gradle/foundry-gradle-plugin/lint-baseline.xml
index 1069fa3c5..4a8a72c14 100644
--- a/platforms/gradle/foundry-gradle-plugin/lint-baseline.xml
+++ b/platforms/gradle/foundry-gradle-plugin/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.8.0-alpha01" type="baseline" client="gradle" dependencies="false" name="AGP (8.7.2)" variant="all" version="8.8.0-alpha01">
+<issues format="6" by="lint 8.9.0-alpha02" type="baseline" client="gradle" dependencies="false" name="AGP (8.8.0)" variant="all" version="8.9.0-alpha02">
 
     <issue
         id="AvoidUsingNotNullOperator"
@@ -63,7 +63,7 @@
         errorLine2="                    ~~">
         <location
             file="src/main/kotlin/foundry/gradle/FoundryExtension.kt"
-            line="1142"
+            line="1146"
             column="21"/>
     </issue>
 
@@ -74,7 +74,7 @@
         errorLine2="                                             ~~">
         <location
             file="src/main/kotlin/foundry/gradle/FoundryProperties.kt"
-            line="63"
+            line="71"
             column="46"/>
     </issue>
 
@@ -85,19 +85,19 @@
         errorLine2="                                                                      ~~">
         <location
             file="src/main/kotlin/foundry/gradle/StandardProjectConfigurations.kt"
-            line="127"
+            line="131"
             column="71"/>
     </issue>
 
     <issue
-        id="MoshiUsageNonMoshiClassPlatform"
-        message="Platform type &apos;Regex&apos; is not natively supported by Moshi."
-        errorLine1="  val removalPatterns: Set&lt;Regex>?,"
-        errorLine2="                       ~~~~~~~~~~~">
+        id="MoshiUsageNonMoshiClassMap"
+        message="Concrete Map type &apos;RegexMap&apos; is not natively supported by Moshi."
+        errorLine1="  val replacementPatterns: RegexMap = RegexMap(),"
+        errorLine2="                           ~~~~~~~~">
         <location
-            file="src/main/kotlin/foundry/gradle/topography/models.kt"
-            line="53"
-            column="24"/>
+            file="src/main/kotlin/foundry/gradle/topography/ModuleFeature.kt"
+            line="26"
+            column="28"/>
     </issue>
 
     <issue
@@ -184,7 +184,7 @@
         errorLine2="                                      ~~~~~~~~~~~">
         <location
             file="src/main/kotlin/foundry/gradle/FoundryProperties.kt"
-            line="830"
+            line="904"
             column="39"/>
     </issue>
 
@@ -195,7 +195,7 @@
         errorLine2="                               ~~~~~~~~~~~">
         <location
             file="src/main/kotlin/foundry/gradle/FoundryRootPlugin.kt"
-            line="67"
+            line="68"
             column="32"/>
     </issue>
 
@@ -206,7 +206,7 @@
         errorLine2="             ~~~~~~~~~~~">
         <location
             file="src/main/kotlin/foundry/gradle/FoundryRootPlugin.kt"
-            line="445"
+            line="447"
             column="14"/>
     </issue>
 
@@ -272,7 +272,7 @@
         errorLine2="                   ~~~~~~~~~~~">
         <location
             file="src/main/kotlin/foundry/gradle/lint/LintTasks.kt"
-            line="339"
+            line="342"
             column="20"/>
     </issue>
 
@@ -393,7 +393,7 @@
         errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/foundry/gradle/StandardProjectConfigurations.kt"
-            line="31"
+            line="32"
             column="1"/>
     </issue>
 
@@ -404,7 +404,7 @@
         errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/foundry/gradle/tasks/TaskExtensions.kt"
-            line="20"
+            line="19"
             column="1"/>
     </issue>
 
@@ -470,7 +470,7 @@
         errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/foundry/gradle/topography/ModuleTopographyTask.kt"
-            line="41"
+            line="49"
             column="1"/>
     </issue>
 
@@ -525,7 +525,7 @@
         errorLine2="        ~~~~~~~~">
         <location
             file="src/main/kotlin/foundry/gradle/FoundryGradleUtil.kt"
-            line="257"
+            line="259"
             column="9"/>
     </issue>
 
diff --git a/tools/foundry-common/lint-baseline.xml b/tools/foundry-common/lint-baseline.xml
index 764ebbf3b..1031f7b08 100644
--- a/tools/foundry-common/lint-baseline.xml
+++ b/tools/foundry-common/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.8.0-alpha01" type="baseline" client="gradle" dependencies="false" name="AGP (8.7.2)" variant="all" version="8.8.0-alpha01">
+<issues format="6" by="lint 8.9.0-alpha02" type="baseline" client="gradle" dependencies="false" name="AGP (8.8.0)" variant="all" version="8.9.0-alpha02">
 
     <issue
         id="AvoidUsingNotNullOperator"
@@ -8,8 +8,30 @@
         errorLine2="                                                       ~~">
         <location
             file="src/main/kotlin/foundry/common/json/JsonTools.kt"
-            line="52"
+            line="57"
             column="56"/>
     </issue>
 
+    <issue
+        id="AvoidUsingNotNullOperator"
+        message="Avoid using the `!!` operator"
+        errorLine1="    return MOSHI.adapter&lt;T>().fromJsonValue(value)!!"
+        errorLine2="                                                  ~~">
+        <location
+            file="src/main/kotlin/foundry/common/json/JsonTools.kt"
+            line="61"
+            column="51"/>
+    </issue>
+
+    <issue
+        id="AvoidUsingNotNullOperator"
+        message="Avoid using the `!!` operator"
+        errorLine1="    for ((key, value) in value!!) {"
+        errorLine2="                              ~~">
+        <location
+            file="src/main/kotlin/foundry/common/json/JsonTools.kt"
+            line="177"
+            column="31"/>
+    </issue>
+
 </issues>