diff --git a/build-logic/kotlin-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/Detekt.kt b/build-logic/kotlin-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/Detekt.kt
new file mode 100644
index 00000000..b9ea1e60
--- /dev/null
+++ b/build-logic/kotlin-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/Detekt.kt
@@ -0,0 +1,28 @@
+package dev.msfjarvis.aps.gradle
+
+import io.gitlab.arturbosch.detekt.DetektPlugin
+import io.gitlab.arturbosch.detekt.extensions.DetektExtension
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.configure
+import org.gradle.language.base.plugins.LifecycleBasePlugin
+
+object Detekt {
+  fun apply(project: Project) {
+    project.pluginManager.apply(DetektPlugin::class.java)
+    project.extensions.configure<DetektExtension> {
+      parallel = true
+      ignoredBuildTypes = listOf("benchmark", "release")
+      basePath = project.layout.projectDirectory.toString()
+      baseline =
+        project.rootProject.layout.projectDirectory
+          .dir("detekt-baselines")
+          .file("${project.name}.xml")
+          .asFile
+    }
+    project.pluginManager.withPlugin("base") {
+      project.tasks.named(LifecycleBasePlugin.CHECK_TASK_NAME).configure {
+        dependsOn(project.tasks.named("detekt"))
+      }
+    }
+  }
+}
diff --git a/build-logic/kotlin-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/KotlinCommonPlugin.kt b/build-logic/kotlin-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/KotlinCommonPlugin.kt
index 4fabd8db..a917525d 100644
--- a/build-logic/kotlin-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/KotlinCommonPlugin.kt
+++ b/build-logic/kotlin-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/KotlinCommonPlugin.kt
@@ -5,38 +5,21 @@
 
 package dev.msfjarvis.aps.gradle
 
-import io.gitlab.arturbosch.detekt.DetektPlugin
-import io.gitlab.arturbosch.detekt.extensions.DetektExtension
 import org.gradle.api.JavaVersion
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.tasks.compile.JavaCompile
 import org.gradle.api.tasks.testing.Test
 import org.gradle.api.tasks.testing.logging.TestLogEvent
-import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.withType
-import org.gradle.language.base.plugins.LifecycleBasePlugin
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 @Suppress("Unused")
 class KotlinCommonPlugin : Plugin<Project> {
 
   override fun apply(project: Project) {
-    project.pluginManager.apply(DetektPlugin::class.java)
-    project.extensions.configure<DetektExtension> {
-      parallel = true
-      ignoredBuildTypes = listOf("benchmark", "release")
-      basePath = project.layout.projectDirectory.toString()
-      baseline =
-        project.rootProject.layout.projectDirectory
-          .dir("detekt-baselines")
-          .file("${project.name}.xml")
-          .asFile
-    }
+    Detekt.apply(project)
     project.tasks.run {
-      project.pluginManager.withPlugin("base") {
-        named(LifecycleBasePlugin.CHECK_TASK_NAME).configure { this.dependsOn(named("detekt")) }
-      }
       withType<JavaCompile>().configureEach {
         sourceCompatibility = JavaVersion.VERSION_11.toString()
         targetCompatibility = JavaVersion.VERSION_11.toString()