diff --git a/fluxo-kmp-conf/dependencies/compileClasspath.txt b/fluxo-kmp-conf/dependencies/compileClasspath.txt
index 6ba7245..109857d 100644
--- a/fluxo-kmp-conf/dependencies/compileClasspath.txt
+++ b/fluxo-kmp-conf/dependencies/compileClasspath.txt
@@ -77,7 +77,7 @@ org.jetbrains.kotlin:kotlin-gradle-plugin-api:2.0.20
 org.jetbrains.kotlin:kotlin-gradle-plugin-model:2.0.20
 org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20
 org.jetbrains.kotlin:kotlin-gradle-plugins-bom:2.0.20
-org.jetbrains.kotlin:kotlin-metadata-jvm:2.0.20
+org.jetbrains.kotlin:kotlin-metadata-jvm:2.0.21
 org.jetbrains.kotlin:kotlin-native-utils:2.0.20
 org.jetbrains.kotlin:kotlin-sam-with-receiver:2.0.20
 org.jetbrains.kotlin:kotlin-tooling-core:2.0.20
diff --git a/fluxo-kmp-conf/detekt-baseline.xml b/fluxo-kmp-conf/detekt-baseline.xml
index 5cf0731..59234c0 100644
--- a/fluxo-kmp-conf/detekt-baseline.xml
+++ b/fluxo-kmp-conf/detekt-baseline.xml
@@ -177,7 +177,6 @@
     <ID>Indentation:FluxoConfigurationExtensionAndroidImpl.kt$FluxoConfigurationExtensionAndroidImpl$ </ID>
     <ID>LongMethod:SetupPublication.kt$private fun FluxoKmpConfContext.setupPublicationRepositoryAndSigning( p: Project, config: FluxoPublicationConfig, publishing: PublishingExtension, mavenRepo: Boolean = true, )</ID>
     <ID>LongMethod:TestReportsMergeTask.kt$TestReportsMergeTask$@TaskAction fun merge()</ID>
-    <ID>MagicNumber:SetupDetekt.kt$2.1</ID>
     <ID>MaxLineLength:ShrinkerReflectiveCaller.kt$ShrinkerReflectiveCaller$logger.w("$shrinker could not be loaded in-memory as $callType (class=$className)!")</ID>
     <ID>MaximumLineLength:ShrinkerReflectiveCaller.kt$ShrinkerReflectiveCaller$ </ID>
     <ID>MutableTypeShouldBePrivate:LoadAndApplyPluginIfNotApplied.kt$val classNames: MutableSet&lt;String></ID>
@@ -192,6 +191,5 @@
     <ID>UnnecessaryPassThroughClass:KotlinMultiplatformActionContainer.kt$KotlinMultiplatformActionContainer : CustomTypeContainerContainerKotlinMultiplatformAware</ID>
     <ID>UnnecessaryPassThroughClass:KotlinProjectActionContainer.kt$KotlinProjectActionContainer : CustomTypeContainerContainerKotlinAware</ID>
     <ID>UnusedPrivateMember:SetupAndroid.kt$private fun Project.configureMonkeyLauncherTasks()</ID>
-    <ID>UnusedPrivateProperty:SetupDetekt.kt$private const val DETEKT_MAX_SUPPORTED_KOTLIN_VERSION = "2.1"</ID>
   </CurrentIssues>
 </SmellBaseline>
diff --git a/fluxo-kmp-conf/lint-baseline.xml b/fluxo-kmp-conf/lint-baseline.xml
index d660b07..7b1098f 100644
--- a/fluxo-kmp-conf/lint-baseline.xml
+++ b/fluxo-kmp-conf/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.6.0-alpha05" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-alpha05)" variant="all" version="8.6.0-alpha05">
+<issues format="6" by="lint 8.7.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.7.0)" variant="all" version="8.7.0">
 
     <issue
         id="StopShip"
@@ -10,4 +10,40 @@
             column="33"/>
     </issue>
 
+    <issue
+        id="AndroidGradlePluginVersion"
+        message="A newer version of com.android.library than 8.7.0 is available: 8.7.2">
+        <location
+            file="$HOME/work/fluxo-kmp-conf/fluxo-kmp-conf/gradle/libs.versions.toml"
+            line="105"
+            column="25"/>
+    </issue>
+
+    <issue
+        id="AndroidGradlePluginVersion"
+        message="A newer version of com.android.library than 8.7.0 is available: 8.7.2">
+        <location
+            file="$HOME/work/fluxo-kmp-conf/fluxo-kmp-conf/gradle/libs.versions.toml"
+            line="105"
+            column="25"/>
+    </issue>
+
+    <issue
+        id="AndroidGradlePluginVersion"
+        message="A newer version of com.android.tools.build:gradle than 8.7.0 is available: 8.7.2">
+        <location
+            file="$HOME/work/fluxo-kmp-conf/fluxo-kmp-conf/gradle/libs.versions.toml"
+            line="105"
+            column="25"/>
+    </issue>
+
+    <issue
+        id="AndroidGradlePluginVersion"
+        message="A newer version of com.android.tools.build:gradle than 8.7.0 is available: 8.7.2">
+        <location
+            file="$HOME/work/fluxo-kmp-conf/fluxo-kmp-conf/gradle/libs.versions.toml"
+            line="105"
+            column="25"/>
+    </issue>
+
 </issues>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index ac25704..7c2cfea 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -147,7 +147,7 @@ proguard-core = "9.1.6"
 # Used by ProGuardCORE.
 # https://mvnrepository.com/artifact/org.jetbrains.kotlin/kotlin-metadata-jvm
 #noinspection GradleDependency.
-kotlin-metadata-jvm = "2.0.20"
+kotlin-metadata-jvm = "2.0.21"
 
 # R8 is a Google's code shrinker, obfuscator, and optimizer. Targeted for Android.
 # https://mvnrepository.com/artifact/com.android.tools/r8?repo=google