diff --git a/gradle.properties b/gradle.properties
index de6168a7a..46f5f47d6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,7 +12,7 @@ android.suppressUnsupportedOptionWarnings=android.suppressUnsupportedOptionWarni
   android.experimental.lint.version
 
 # Force use of the latest android lint version
-android.experimental.lint.version=8.6.0-alpha06
+android.experimental.lint.version=8.8.0-alpha01
 android.experimental.lint.missingBaselineIsEmptyBaseline=true
 
 # Disable noisy DAGP logs
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 7e34de55d..cc53fa616 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "8.5.2"
+agp = "8.6.0"
 agpAlpha = "8.6.0"
 anvil = "2.5.0-beta11"
 bugsnagGradle = "8.1.0"
@@ -74,7 +74,7 @@ coroutines-core = { 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.0.4"
-gradleLints = "androidx.lint:lint-gradle:1.0.0-alpha01"
+gradleLints = "androidx.lint:lint-gradle:1.0.0-alpha02"
 gradlePlugins-anvil = { module = "com.squareup.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" }
diff --git a/slack-plugin/lint-baseline.xml b/slack-plugin/lint-baseline.xml
index 7b30656f7..eb62966d4 100644
--- a/slack-plugin/lint-baseline.xml
+++ b/slack-plugin/lint-baseline.xml
@@ -1,8 +1,184 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.6.0-alpha06" type="baseline" client="gradle" dependencies="false" name="AGP (8.5.0)" variant="all" version="8.6.0-alpha06">
+<issues format="6" by="lint 8.8.0-alpha01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0)" variant="all" version="8.8.0-alpha01">
 
     <issue
-        id="InternalGradleApiUsage"
+        id="GradleProjectIsolation"
+        message="Avoid using method getRootProject"
+        errorLine1="        project.rootProject.layout.projectDirectory.file(&quot;ci/release.version&quot;)"
+        errorLine2="                ~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/slack/gradle/ApkVersioningPlugin.kt"
+            line="82"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method getRootProject"
+        errorLine1="        project.rootProject.file(&quot;config/detekt/detekt.yml&quot;)"
+        errorLine2="                ~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/slack/gradle/lint/DetektTasks.kt"
+            line="83"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method getRootProject"
+        errorLine1="            config.from(project.rootProject.file(configFile))"
+        errorLine2="                                ~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/slack/gradle/lint/DetektTasks.kt"
+            line="86"
+            column="33"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method getRootProject"
+        errorLine1="  if (project.rootProject.extensions.findByName(&quot;develocity&quot;) != null) {"
+        errorLine2="              ~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/slack/gradle/develocity/DevelocityFinderApi.kt"
+            line="33"
+            column="15"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method getRootProject"
+        errorLine1="    return DevelocityConfigurationAdapter(project.rootProject.extensions.getByName(&quot;develocity&quot;))"
+        errorLine2="                                                  ~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/slack/gradle/develocity/DevelocityFinderApi.kt"
+            line="34"
+            column="51"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method getRootProject"
+        errorLine1="  } else if (project.rootProject.extensions.findByName(&quot;gradleEnterprise&quot;) != null) {"
+        errorLine2="                     ~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/slack/gradle/develocity/DevelocityFinderApi.kt"
+            line="36"
+            column="22"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method getRootProject"
+        errorLine1="        project.rootProject.extensions.getByName(&quot;gradleEnterprise&quot;)"
+        errorLine2="                ~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/slack/gradle/develocity/DevelocityFinderApi.kt"
+            line="38"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method getRootProject"
+        errorLine1="      check(project == project.rootProject) { &quot;Project is not root project!&quot; }"
+        errorLine2="                               ~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/slack/gradle/GlobalConfig.kt"
+            line="32"
+            column="32"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method getRootProject"
+        errorLine1="  get() = rootProject === this"
+        errorLine2="          ~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/slack/gradle/GradleExt.kt"
+            line="63"
+            column="11"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Use providers.gradleProperty instead of findProperty"
+        errorLine1="      (findProperty(AndroidProject.PROPERTY_BUILD_MODEL_ONLY) == &quot;true&quot; ||"
+        errorLine2="       ~~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/slack/gradle/GradleExt.kt"
+            line="239"
+            column="8"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Use providers.gradleProperty instead of findProperty"
+        errorLine1="        findProperty(AndroidProject.PROPERTY_GENERATE_SOURCES_ONLY) == &quot;true&quot;)"
+        errorLine2="        ~~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/slack/gradle/GradleExt.kt"
+            line="240"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Use providers.gradleProperty instead of hasProperty"
+        errorLine1="  get() = hasProperty(&quot;android.injected.invoked.from.ide&quot;)"
+        errorLine2="          ~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/slack/gradle/GradleExt.kt"
+            line="244"
+            column="11"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method getRootProject"
+        errorLine1="      lintConfig = rootProject.layout.projectDirectory.file(&quot;config/lint/lint.xml&quot;).asFile"
+        errorLine2="                   ~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/slack/gradle/lint/LintTasks.kt"
+            line="339"
+            column="20"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method getRootProject"
+        errorLine1="    require(project == project.rootProject) {"
+        errorLine2="                               ~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/slack/gradle/SlackRootPlugin.kt"
+            line="70"
+            column="32"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method getRootProject"
+        errorLine1="      delete(rootProject.layout.buildDirectory)"
+        errorLine2="             ~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/slack/gradle/SlackRootPlugin.kt"
+            line="488"
+            column="14"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method getRootProject"
+        errorLine1="            else -> project.rootProject.projectDir.absolutePath"
+        errorLine2="                            ~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/slack/unittest/UnitTests.kt"
+            line="228"
+            column="29"/>
+    </issue>
+
+    <issue
+        id="InternalAgpApiUsage"
         message="Avoid using internal Android Gradle Plugin APIs"
         errorLine1="import com.android.build.gradle.internal.SdkLocationSourceSet"
         errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -13,7 +189,7 @@
     </issue>
 
     <issue
-        id="InternalGradleApiUsage"
+        id="InternalAgpApiUsage"
         message="Avoid using internal Android Gradle Plugin APIs"
         errorLine1="import com.android.build.gradle.internal.SdkLocator"
         errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -24,7 +200,7 @@
     </issue>
 
     <issue
-        id="InternalGradleApiUsage"
+        id="InternalAgpApiUsage"
         message="Avoid using internal Android Gradle Plugin APIs"
         errorLine1="import com.android.build.gradle.internal.dsl.BuildType"
         errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -35,7 +211,7 @@
     </issue>
 
     <issue
-        id="InternalGradleApiUsage"
+        id="InternalAgpApiUsage"
         message="Avoid using internal Android Gradle Plugin APIs"
         errorLine1="import com.android.build.gradle.internal.publishing.AndroidArtifacts"
         errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -46,7 +222,7 @@
     </issue>
 
     <issue
-        id="InternalGradleApiUsage"
+        id="InternalAgpApiUsage"
         message="Avoid using internal Android Gradle Plugin APIs"
         errorLine1="import com.android.build.gradle.internal.publishing.AndroidArtifacts.ArtifactType"
         errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -56,6 +232,61 @@
             column="1"/>
     </issue>
 
+    <issue
+        id="InternalAgpApiUsage"
+        message="Avoid using internal Android Gradle Plugin APIs"
+        errorLine1="import com.android.build.gradle.internal.lint.AndroidLintAnalysisTask"
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/slack/gradle/lint/LintTasks.kt"
+            line="23"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="InternalAgpApiUsage"
+        message="Avoid using internal Android Gradle Plugin APIs"
+        errorLine1="import com.android.build.gradle.internal.lint.LintModelWriterTask"
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/slack/gradle/lint/LintTasks.kt"
+            line="24"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="InternalAgpApiUsage"
+        message="Avoid using internal Android Gradle Plugin APIs"
+        errorLine1="import com.android.build.gradle.internal.lint.VariantInputs"
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/slack/gradle/lint/LintTasks.kt"
+            line="25"
+            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/slack/gradle/SlackExtension.kt"
+            line="25"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="InternalAgpApiUsage"
+        message="Avoid using internal Android Gradle Plugin APIs"
+        errorLine1="import com.android.build.gradle.internal.dsl.BaseAppModuleExtension"
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/slack/gradle/StandardProjectConfigurations.kt"
+            line="31"
+            column="1"/>
+    </issue>
+
     <issue
         id="InternalGradleApiUsage"
         message="Avoid using internal Gradle APIs"
@@ -96,40 +327,7 @@
         errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/slack/gradle/GradleExt.kt"
-            line="43"
-            column="1"/>
-    </issue>
-
-    <issue
-        id="InternalGradleApiUsage"
-        message="Avoid using internal Android Gradle Plugin APIs"
-        errorLine1="import com.android.build.gradle.internal.lint.AndroidLintAnalysisTask"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/slack/gradle/lint/LintTasks.kt"
-            line="23"
-            column="1"/>
-    </issue>
-
-    <issue
-        id="InternalGradleApiUsage"
-        message="Avoid using internal Android Gradle Plugin APIs"
-        errorLine1="import com.android.build.gradle.internal.lint.LintModelWriterTask"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/slack/gradle/lint/LintTasks.kt"
-            line="24"
-            column="1"/>
-    </issue>
-
-    <issue
-        id="InternalGradleApiUsage"
-        message="Avoid using internal Android Gradle Plugin APIs"
-        errorLine1="import com.android.build.gradle.internal.lint.VariantInputs"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/slack/gradle/lint/LintTasks.kt"
-            line="25"
+            line="42"
             column="1"/>
     </issue>
 
@@ -155,17 +353,6 @@
             column="1"/>
     </issue>
 
-    <issue
-        id="InternalGradleApiUsage"
-        message="Avoid using internal Android Gradle Plugin APIs"
-        errorLine1="import com.android.build.gradle.internal.tasks.databinding.DataBindingGenBaseClassesTask"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/slack/gradle/SlackExtension.kt"
-            line="24"
-            column="1"/>
-    </issue>
-
     <issue
         id="InternalGradleApiUsage"
         message="Avoid using internal Gradle APIs"
@@ -178,14 +365,36 @@
     </issue>
 
     <issue
-        id="InternalGradleApiUsage"
-        message="Avoid using internal Android Gradle Plugin APIs"
-        errorLine1="import com.android.build.gradle.internal.dsl.BaseAppModuleExtension"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        id="WithTypeWithoutConfigureEach"
+        message="Avoid passing a closure to withType, use withType().configureEach instead"
+        errorLine1="        project.tasks.withType(JavaCompile::class.java, baseConfig.javaCompileAptAction)"
+        errorLine2="                      ~~~~~~~~">
         <location
-            file="src/main/kotlin/slack/gradle/StandardProjectConfigurations.kt"
-            line="31"
-            column="1"/>
+            file="src/main/kotlin/slack/gradle/AnnotationProcessing.kt"
+            line="142"
+            column="23"/>
+    </issue>
+
+    <issue
+        id="WithTypeWithoutConfigureEach"
+        message="Avoid passing a closure to withType, use withType().configureEach instead"
+        errorLine1="    project.plugins.withType(AppPlugin::class.java) {"
+        errorLine2="                    ~~~~~~~~">
+        <location
+            file="src/main/kotlin/slack/gradle/ApkVersioningPlugin.kt"
+            line="50"
+            column="21"/>
+    </issue>
+
+    <issue
+        id="WithTypeWithoutConfigureEach"
+        message="Avoid passing a closure to withType, use withType().configureEach instead"
+        errorLine1="  tasks.withType(T::class.java) {"
+        errorLine2="        ~~~~~~~~">
+        <location
+            file="src/main/kotlin/slack/gradle/SlackGradleUtil.kt"
+            line="270"
+            column="9"/>
     </issue>
 
     <issue