diff --git a/platforms/gradle/foundry-gradle-plugin/lint-baseline.xml b/platforms/gradle/foundry-gradle-plugin/lint-baseline.xml
index 6e20b3332..0b6a5782f 100644
--- a/platforms/gradle/foundry-gradle-plugin/lint-baseline.xml
+++ b/platforms/gradle/foundry-gradle-plugin/lint-baseline.xml
@@ -1,5 +1,148 @@
 <?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.6.1)" variant="all" version="8.8.0-alpha01">
+<issues format="6" by="lint 8.8.0-alpha01" type="baseline" client="gradle" dependencies="false" name="AGP (8.7.1)" variant="all" version="8.8.0-alpha01">
+
+    <issue
+        id="AvoidUsingNotNullOperator"
+        message="Avoid using the `!!` operator"
+        errorLine1="  val segmentName = this::class.simpleName!!"
+        errorLine2="                                          ~~">
+        <location
+            file="src/main/kotlin/foundry/gradle/dependencies/DependencyCollection.kt"
+            line="111"
+            column="43"/>
+    </issue>
+
+    <issue
+        id="AvoidUsingNotNullOperator"
+        message="Avoid using the `!!` operator"
+        errorLine1="    gradleProperty ?: this::class.simpleName!!.lowercase(Locale.US)"
+        errorLine2="                                            ~~">
+        <location
+            file="src/main/kotlin/foundry/gradle/dependencies/DependencyGroup.kt"
+            line="43"
+            column="45"/>
+    </issue>
+
+    <issue
+        id="AvoidUsingNotNullOperator"
+        message="Avoid using the `!!` operator"
+        errorLine1="                    var newConfiguration = advice.toConfiguration!!"
+        errorLine2="                                                                 ~~">
+        <location
+            file="src/main/kotlin/foundry/gradle/dependencyrake/DependencyRake.kt"
+            line="231"
+            column="66"/>
+    </issue>
+
+    <issue
+        id="AvoidUsingNotNullOperator"
+        message="Avoid using the `!!` operator"
+        errorLine1="              val oldConfiguration = abiDep.fromConfiguration!!"
+        errorLine2="                                                             ~~">
+        <location
+            file="src/main/kotlin/foundry/gradle/dependencyrake/DependencyRake.kt"
+            line="300"
+            column="62"/>
+    </issue>
+
+    <issue
+        id="AvoidUsingNotNullOperator"
+        message="Avoid using the `!!` operator"
+        errorLine1="              var newConfiguration = abiDep.toConfiguration!!"
+        errorLine2="                                                           ~~">
+        <location
+            file="src/main/kotlin/foundry/gradle/dependencyrake/DependencyRake.kt"
+            line="301"
+            column="60"/>
+    </issue>
+
+    <issue
+        id="AvoidUsingNotNullOperator"
+        message="Avoid using the `!!` operator"
+        errorLine1="    androidExtension!!.testOptions.unitTests.isIncludeAndroidResources = true"
+        errorLine2="                    ~~">
+        <location
+            file="src/main/kotlin/foundry/gradle/FoundryExtension.kt"
+            line="1142"
+            column="21"/>
+    </issue>
+
+    <issue
+        id="AvoidUsingNotNullOperator"
+        message="Avoid using the `!!` operator"
+        errorLine1="    optionalStringProperty(key, defaultValue)!!"
+        errorLine2="                                             ~~">
+        <location
+            file="src/main/kotlin/foundry/gradle/FoundryProperties.kt"
+            line="59"
+            column="46"/>
+    </issue>
+
+    <issue
+        id="AvoidUsingNotNullOperator"
+        message="Avoid using the `!!` operator"
+        errorLine1="      statsFiles.map { it.source().buffer().use(adapter::fromJson)!! }.sortedBy { it.modulePath }"
+        errorLine2="                                                                  ~~">
+        <location
+            file="src/main/kotlin/foundry/gradle/stats/ModuleStats.kt"
+            line="314"
+            column="67"/>
+    </issue>
+
+    <issue
+        id="AvoidUsingNotNullOperator"
+        message="Avoid using the `!!` operator"
+        errorLine1="          JsonTools.MOSHI.adapter&lt;LocTask.LocData>().fromJson(it)!!"
+        errorLine2="                                                                 ~~">
+        <location
+            file="src/main/kotlin/foundry/gradle/stats/ModuleStats.kt"
+            line="411"
+            column="66"/>
+    </issue>
+
+    <issue
+        id="AvoidUsingNotNullOperator"
+        message="Avoid using the `!!` operator"
+        errorLine1="      }!!"
+        errorLine2="       ~~">
+        <location
+            file="src/main/kotlin/foundry/gradle/topography/ModuleTopographyTask.kt"
+            line="232"
+            column="8"/>
+    </issue>
+
+    <issue
+        id="AvoidUsingNotNullOperator"
+        message="Avoid using the `!!` operator"
+        errorLine1="        path.source().buffer().use { JsonTools.MOSHI.adapter&lt;VersionsOutput>().fromJson(it)!! }"
+        errorLine2="                                                                                           ~~">
+        <location
+            file="src/main/kotlin/foundry/gradle/Platforms.kt"
+            line="173"
+            column="92"/>
+    </issue>
+
+    <issue
+        id="AvoidUsingNotNullOperator"
+        message="Avoid using the `!!` operator"
+        errorLine1="      Publisher.interProjectPublisher(project, artifact.objectInstance!!)"
+        errorLine2="                                                                      ~~">
+        <location
+            file="src/main/kotlin/foundry/gradle/StandardProjectConfigurations.kt"
+            line="127"
+            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="                       ~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/foundry/gradle/topography/models.kt"
+            line="34"
+            column="24"/>
+    </issue>
 
     <issue
         id="GradleProjectIsolation"
@@ -85,7 +228,7 @@
         errorLine2="                ~~~~~~~~~~~">
         <location
             file="src/main/kotlin/foundry/gradle/FoundryProperties.kt"
-            line="175"
+            line="184"
             column="17"/>
     </issue>
 
@@ -96,7 +239,7 @@
         errorLine2="                               ~~~~~~~~~~~">
         <location
             file="src/main/kotlin/foundry/gradle/FoundryRootPlugin.kt"
-            line="69"
+            line="67"
             column="32"/>
     </issue>
 
@@ -107,7 +250,7 @@
         errorLine2="             ~~~~~~~~~~~">
         <location
             file="src/main/kotlin/foundry/gradle/FoundryRootPlugin.kt"
-            line="489"
+            line="441"
             column="14"/>
     </issue>
 
@@ -118,7 +261,7 @@
         errorLine2="                               ~~~~~~~~~~~">
         <location
             file="src/main/kotlin/foundry/gradle/GlobalConfig.kt"
-            line="32"
+            line="33"
             column="32"/>
     </issue>
 
@@ -287,6 +430,17 @@
             column="1"/>
     </issue>
 
+    <issue
+        id="InternalAgpApiUsage"
+        message="Avoid using internal Android Gradle Plugin APIs"
+        errorLine1="import com.android.build.gradle.internal.tasks.databinding.DataBindingGenBaseClassesTask"
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/foundry/gradle/topography/ModuleTopographyTask.kt"
+            line="18"
+            column="1"/>
+    </issue>
+
     <issue
         id="InternalAgpApiUsage"
         message="Avoid using internal Android Gradle Plugin APIs"
@@ -353,6 +507,17 @@
             column="1"/>
     </issue>
 
+    <issue
+        id="InternalGradleApiUsage"
+        message="Avoid using internal Gradle APIs"
+        errorLine1="import org.gradle.api.internal.plugins.PluginRegistry"
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/foundry/gradle/topography/ModuleTopographyTask.kt"
+            line="47"
+            column="1"/>
+    </issue>
+
     <issue
         id="InternalGradleApiUsage"
         message="Avoid using internal Gradle APIs"
@@ -360,7 +525,7 @@
         errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/foundry/gradle/Platforms.kt"
-            line="33"
+            line="32"
             column="1"/>
     </issue>
 
@@ -404,7 +569,7 @@
         errorLine2="        ~~~~~~~~">
         <location
             file="src/main/kotlin/foundry/gradle/FoundryGradleUtil.kt"
-            line="270"
+            line="257"
             column="9"/>
     </issue>
 
@@ -415,7 +580,7 @@
         errorLine2="                                                    ~~~~~~~">
         <location
             file="src/main/kotlin/foundry/gradle/Platforms.kt"
-            line="269"
+            line="187"
             column="53"/>
     </issue>
 
diff --git a/platforms/intellij/compose/lint-baseline.xml b/platforms/intellij/compose/lint-baseline.xml
new file mode 100644
index 000000000..b3d42f08a
--- /dev/null
+++ b/platforms/intellij/compose/lint-baseline.xml
@@ -0,0 +1,15 @@
+<?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.1)" variant="all" version="8.8.0-alpha01">
+
+    <issue
+        id="AvoidUsingNotNullOperator"
+        message="Avoid using the `!!` operator"
+        errorLine1="            markdown!!,"
+        errorLine2="                    ~~">
+        <location
+            file="src/jvmMain/kotlin/foundry/intellij/compose/markdown/ui/MarkdownPanel.kt"
+            line="100"
+            column="21"/>
+    </issue>
+
+</issues>
diff --git a/platforms/intellij/skate/lint-baseline.xml b/platforms/intellij/skate/lint-baseline.xml
new file mode 100644
index 000000000..03b856281
--- /dev/null
+++ b/platforms/intellij/skate/lint-baseline.xml
@@ -0,0 +1,114 @@
+<?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.1)" variant="all" version="8.8.0-alpha01">
+
+    <issue
+        id="AvoidUsingNotNullOperator"
+        message="Avoid using the `!!` operator"
+        errorLine1="      .map { codeOwnershipMap[it]!! }"
+        errorLine2="                                 ~~">
+        <location
+            file="src/main/kotlin/foundry/intellij/skate/codeowners/CodeOwnerRepository.kt"
+            line="77"
+            column="34"/>
+    </issue>
+
+    <issue
+        id="AvoidUsingNotNullOperator"
+        message="Avoid using the `!!` operator"
+        errorLine1="    assertThat(translatorWarning!!.description).isEqualTo(warningDescription)"
+        errorLine2="                                ~~">
+        <location
+            file="src/test/kotlin/foundry/intellij/skate/modeltranslator/TranslatorAnnotatorTest.kt"
+            line="168"
+            column="33"/>
+    </issue>
+
+    <issue
+        id="AvoidUsingNotNullOperator"
+        message="Avoid using the `!!` operator"
+        errorLine1="    assertThat(body!!.text)"
+        errorLine2="                   ~~">
+        <location
+            file="src/test/kotlin/foundry/intellij/skate/modeltranslator/TranslatorHelperTest.kt"
+            line="42"
+            column="20"/>
+    </issue>
+
+    <issue
+        id="AvoidUsingNotNullOperator"
+        message="Avoid using the `!!` operator"
+        errorLine1="    assertThat(body!!.text)"
+        errorLine2="                   ~~">
+        <location
+            file="src/test/kotlin/foundry/intellij/skate/modeltranslator/TranslatorHelperTest.kt"
+            line="64"
+            column="20"/>
+    </issue>
+
+    <issue
+        id="AvoidUsingNotNullOperator"
+        message="Avoid using the `!!` operator"
+        errorLine1="    assertThat(body!!.text)"
+        errorLine2="                   ~~">
+        <location
+            file="src/test/kotlin/foundry/intellij/skate/modeltranslator/TranslatorHelperTest.kt"
+            line="86"
+            column="20"/>
+    </issue>
+
+    <issue
+        id="AvoidUsingNotNullOperator"
+        message="Avoid using the `!!` operator"
+        errorLine1="    assertThat(body!!.text)"
+        errorLine2="                   ~~">
+        <location
+            file="src/test/kotlin/foundry/intellij/skate/modeltranslator/TranslatorHelperTest.kt"
+            line="108"
+            column="20"/>
+    </issue>
+
+    <issue
+        id="AvoidUsingNotNullOperator"
+        message="Avoid using the `!!` operator"
+        errorLine1="    assertThat(body!!.text)"
+        errorLine2="                   ~~">
+        <location
+            file="src/test/kotlin/foundry/intellij/skate/modeltranslator/TranslatorHelperTest.kt"
+            line="125"
+            column="20"/>
+    </issue>
+
+    <issue
+        id="AvoidUsingNotNullOperator"
+        message="Avoid using the `!!` operator"
+        errorLine1="    assertThat(body!!.text)"
+        errorLine2="                   ~~">
+        <location
+            file="src/test/kotlin/foundry/intellij/skate/modeltranslator/TranslatorHelperTest.kt"
+            line="142"
+            column="20"/>
+    </issue>
+
+    <issue
+        id="AvoidUsingNotNullOperator"
+        message="Avoid using the `!!` operator"
+        errorLine1="  private fun getNamedFunction() = file.findDescendantOfType&lt;KtNamedFunction>()!!"
+        errorLine2="                                                                               ~~">
+        <location
+            file="src/test/kotlin/foundry/intellij/skate/modeltranslator/TranslatorHelperTest.kt"
+            line="153"
+            column="80"/>
+    </issue>
+
+    <issue
+        id="AvoidUsingNotNullOperator"
+        message="Avoid using the `!!` operator"
+        errorLine1="    return TranslatorHelper.generateBody(TranslatorHelper.extractBundle(getNamedFunction())!!)"
+        errorLine2="                                                                                           ~~">
+        <location
+            file="src/test/kotlin/foundry/intellij/skate/modeltranslator/TranslatorHelperTest.kt"
+            line="156"
+            column="92"/>
+    </issue>
+
+</issues>
diff --git a/tools/cli/lint-baseline.xml b/tools/cli/lint-baseline.xml
index 200b189a3..c47e64f94 100644
--- a/tools/cli/lint-baseline.xml
+++ b/tools/cli/lint-baseline.xml
@@ -1,5 +1,104 @@
 <?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.6.1)" variant="all" version="8.8.0-alpha01">
+<issues format="6" by="lint 8.8.0-alpha01" type="baseline" client="gradle" dependencies="false" name="AGP (8.7.1)" variant="all" version="8.8.0-alpha01">
+
+    <issue
+        id="AvoidUsingNotNullOperator"
+        message="Avoid using the `!!` operator"
+        errorLine1="    val results = runs.first().results!!"
+        errorLine2="                                      ~~">
+        <location
+            file="src/main/kotlin/foundry/cli/sarif/ApplyBaselinesToSarifs.kt"
+            line="98"
+            column="39"/>
+    </issue>
+
+    <issue
+        id="AvoidUsingNotNullOperator"
+        message="Avoid using the `!!` operator"
+        errorLine1="    val baselineResults = baseline.runs.first().results!!"
+        errorLine2="                                                       ~~">
+        <location
+            file="src/main/kotlin/foundry/cli/sarif/ApplyBaselinesToSarifs.kt"
+            line="99"
+            column="56"/>
+    </issue>
+
+    <issue
+        id="AvoidUsingNotNullOperator"
+        message="Avoid using the `!!` operator"
+        errorLine1="          val originalUri = run.originalURIBaseIDS!!.getValue(SRC_ROOT)"
+        errorLine2="                                                  ~~">
+        <location
+            file="src/main/kotlin/foundry/cli/sarif/MergeSarifReports.kt"
+            line="202"
+            column="51"/>
+    </issue>
+
+    <issue
+        id="AvoidUsingNotNullOperator"
+        message="Avoid using the `!!` operator"
+        errorLine1="  override fun fromJson(reader: JsonReader) = stringAdapter.fromJson(reader)!!.toRegex()"
+        errorLine2="                                                                            ~~">
+        <location
+            file="src/main/kotlin/foundry/cli/util/RegexJsonAdapter.kt"
+            line="29"
+            column="77"/>
+    </issue>
+
+    <issue
+        id="AvoidUsingNotNullOperator"
+        message="Avoid using the `!!` operator"
+        errorLine1="    assert(regex!!.pattern == &quot;.*&quot;)"
+        errorLine2="                ~~">
+        <location
+            file="src/test/kotlin/foundry/cli/util/RegexJsonAdapterFactoryTest.kt"
+            line="29"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="AvoidUsingNotNullOperator"
+        message="Avoid using the `!!` operator"
+        errorLine1="    val issue = adapter.fromJson(json)!!"
+        errorLine2="                                      ~~">
+        <location
+            file="src/test/kotlin/foundry/cli/shellsentry/ShellSentryConfigTest.kt"
+            line="50"
+            column="39"/>
+    </issue>
+
+    <issue
+        id="AvoidUsingNotNullOperator"
+        message="Avoid using the `!!` operator"
+        errorLine1="    val list = moshi.adapter&lt;List&lt;String>>().fromJson(&quot;&quot;&quot;&quot;foo&quot;&quot;&quot;&quot;)!!"
+        errorLine2="                                                                  ~~">
+        <location
+            file="src/test/kotlin/foundry/cli/util/SingleItemListAdapterTest.kt"
+            line="27"
+            column="67"/>
+    </issue>
+
+    <issue
+        id="AvoidUsingNotNullOperator"
+        message="Avoid using the `!!` operator"
+        errorLine1="              add(collectionTypeAdapter.fromJson(reader)!!)"
+        errorLine2="                                                        ~~">
+        <location
+            file="src/main/kotlin/foundry/cli/util/SingleItemListJsonAdapterFactory.kt"
+            line="67"
+            column="57"/>
+    </issue>
+
+    <issue
+        id="AvoidUsingNotNullOperator"
+        message="Avoid using the `!!` operator"
+        errorLine1="          result = listOf(collectionTypeAdapter.fromJson(reader)!!)"
+        errorLine2="                                                                ~~">
+        <location
+            file="src/main/kotlin/foundry/cli/util/SingleItemListJsonAdapterFactory.kt"
+            line="79"
+            column="65"/>
+    </issue>
 
     <issue
         id="MoshiUsageNonMoshiClassPlatform"
@@ -19,7 +118,7 @@
         errorLine2="    ~~~~~">
         <location
             file="src/test/kotlin/foundry/cli/shellsentry/ResultProcessorTest.kt"
-            line="132"
+            line="134"
             column="5"/>
     </issue>
 
@@ -30,7 +129,7 @@
         errorLine2="    ~~~~~">
         <location
             file="src/test/kotlin/foundry/cli/shellsentry/ResultProcessorTest.kt"
-            line="146"
+            line="148"
             column="5"/>
     </issue>
 
@@ -41,7 +140,7 @@
         errorLine2="    ~~~~~">
         <location
             file="src/test/kotlin/foundry/cli/shellsentry/ResultProcessorTest.kt"
-            line="160"
+            line="162"
             column="5"/>
     </issue>
 
@@ -52,7 +151,7 @@
         errorLine2="    ~~~~~">
         <location
             file="src/test/kotlin/foundry/cli/shellsentry/ResultProcessorTest.kt"
-            line="174"
+            line="176"
             column="5"/>
     </issue>
 
@@ -63,7 +162,7 @@
         errorLine2="    ~~~~~">
         <location
             file="src/test/kotlin/foundry/cli/shellsentry/ResultProcessorTest.kt"
-            line="188"
+            line="190"
             column="5"/>
     </issue>
 
@@ -74,7 +173,7 @@
         errorLine2="    ~~~~~">
         <location
             file="src/test/kotlin/foundry/cli/shellsentry/ResultProcessorTest.kt"
-            line="223"
+            line="225"
             column="5"/>
     </issue>
 
diff --git a/tools/skippy/lint-baseline.xml b/tools/skippy/lint-baseline.xml
new file mode 100644
index 000000000..e78892ed9
--- /dev/null
+++ b/tools/skippy/lint-baseline.xml
@@ -0,0 +1,26 @@
+<?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.1)" variant="all" version="8.8.0-alpha01">
+
+    <issue
+        id="AvoidUsingNotNullOperator"
+        message="Avoid using the `!!` operator"
+        errorLine1="  return filterKeys { it != null }.mapKeys { it.key!! }"
+        errorLine2="                                                   ~~">
+        <location
+            file="src/main/kotlin/foundry/skippy/AffectedProjectsComputer.kt"
+            line="338"
+            column="52"/>
+    </issue>
+
+    <issue
+        id="AvoidUsingNotNullOperator"
+        message="Avoid using the `!!` operator"
+        errorLine1="      moshi.adapter&lt;List&lt;SkippyConfig>>().fromJson(config.readText())!!.associateBy { it.tool }"
+        errorLine2="                                                                     ~~">
+        <location
+            file="src/main/kotlin/foundry/skippy/ComputeAffectedProjectsCli.kt"
+            line="113"
+            column="70"/>
+    </issue>
+
+</issues>