diff --git a/build.gradle.kts b/build.gradle.kts
index ce4839b..9ae0d41 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -24,10 +24,15 @@ dokka {
 }
 
 detekt {
-    source.from(files(rootProject.rootDir))
+    source.from(fileTree(rootProject.rootDir) {
+        include("**/*.kt")
+        exclude("**/*.kts")
+        exclude("**/resources/**")
+        exclude("**/generated/**")
+        exclude("**/build/**")
+    })
     parallel = true
     autoCorrect = true
-    buildUponDefaultConfig = true
 }
 
 dependencies {
@@ -35,19 +40,7 @@ dependencies {
 }
 
 tasks {
-    fun SourceTask.config() {
-        include("**/*.kt")
-        exclude("**/*.kts")
-        exclude("**/resources/**")
-        exclude("**/generated/**")
-        exclude("**/build/**")
-    }
-    withType<DetektCreateBaselineTask>().configureEach {
-        config()
-    }
     withType<Detekt>().configureEach {
-        config()
-
         reports {
             sarif.required.set(true)
         }
@@ -55,7 +48,6 @@ tasks {
 }
 
 apiValidation {
-    @OptIn(kotlinx.validation.ExperimentalBCVApi::class)
     klib {
         enabled = true
     }
diff --git a/detekt-baseline.xml b/detekt-baseline.xml
index acb580f..2cd433d 100644
--- a/detekt-baseline.xml
+++ b/detekt-baseline.xml
@@ -4,7 +4,6 @@
   <CurrentIssues>
     <ID>FunctionNaming:Dsl.kt$public fun Uuidv7(timeStamp: Instant = Clock.System.now(), random: Random): Uuid</ID>
     <ID>FunctionNaming:Uuidv7.kt$public fun Uuidv7(timeStamp: Long, random: Random): Uuid</ID>
-    <ID>MagicNumber:KotlinConfig.kt$8</ID>
     <ID>MagicNumber:NameBasedGenerator.kt$0x3f</ID>
     <ID>MagicNumber:NameBasedGenerator.kt$4</ID>
     <ID>MagicNumber:NameBasedGenerator.kt$6</ID>