diff --git a/build-logic/android-plugins/build.gradle.kts b/build-logic/android-plugins/build.gradle.kts
new file mode 100644
index 00000000..8e2d31cc
--- /dev/null
+++ b/build-logic/android-plugins/build.gradle.kts
@@ -0,0 +1,3 @@
+plugins { `kotlin-dsl` }
+
+dependencies { implementation(libs.build.agp) }
diff --git a/build-logic/automation-plugins/build.gradle.kts b/build-logic/automation-plugins/build.gradle.kts
new file mode 100644
index 00000000..e28b0255
--- /dev/null
+++ b/build-logic/automation-plugins/build.gradle.kts
@@ -0,0 +1 @@
+plugins { `kotlin-dsl` }
diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
deleted file mode 100644
index 070eb82a..00000000
--- a/build-logic/build.gradle.kts
+++ /dev/null
@@ -1,3 +0,0 @@
-plugins { `kotlin-dsl` }
-
-dependencies { implementation(libs.build.spotless) }
diff --git a/build-logic/kotlin-plugins/build.gradle.kts b/build-logic/kotlin-plugins/build.gradle.kts
new file mode 100644
index 00000000..f8fbca41
--- /dev/null
+++ b/build-logic/kotlin-plugins/build.gradle.kts
@@ -0,0 +1,5 @@
+plugins { `kotlin-dsl` }
+
+dependencies {
+  implementation(libs.build.spotless)
+}
diff --git a/build-logic/src/main/kotlin/com.github.android-password-store.spotless.gradle.kts b/build-logic/kotlin-plugins/src/main/kotlin/com.github.android-password-store.spotless.gradle.kts
similarity index 94%
rename from build-logic/src/main/kotlin/com.github.android-password-store.spotless.gradle.kts
rename to build-logic/kotlin-plugins/src/main/kotlin/com.github.android-password-store.spotless.gradle.kts
index 3d5e589d..83fae3d5 100644
--- a/build-logic/src/main/kotlin/com.github.android-password-store.spotless.gradle.kts
+++ b/build-logic/kotlin-plugins/src/main/kotlin/com.github.android-password-store.spotless.gradle.kts
@@ -13,6 +13,7 @@ spotless {
   kotlinGradle {
     ktfmt().googleStyle()
     target("**/*.kts")
+    targetExclude("**/build/")
   }
   format("xml") {
     target("**/*.xml")
diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts
index 6afc1258..54fd3070 100644
--- a/build-logic/settings.gradle.kts
+++ b/build-logic/settings.gradle.kts
@@ -1,7 +1,3 @@
-rootProject.name = "build-logic"
-
-enableFeaturePreview("VERSION_CATALOGS")
-
 pluginManagement {
   repositories {
     google()