diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 6eea46586e..6ffca2f36f 100755
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -628,10 +628,11 @@ tasks.register<Copy>("copyPluginApiJarToAssets") {
 }
 
 tasks.register<Zip>("createPluginArtifactsZip") {
-    dependsOn("copyPluginApiJarToAssets", ":plugin-api:plugin-builder:jar")
+    dependsOn("copyPluginApiJarToAssets")
+    dependsOn(gradle.includedBuild("plugin-builder").task(":jar"))
 
     from(rootProject.file("assets/plugin-api.jar"))
-    from(project(":plugin-api:plugin-builder").layout.buildDirectory.file("libs/plugin-builder-1.0.0.jar")) {
+    from(rootProject.file("plugin-api/plugin-builder/build/libs/plugin-builder-1.0.0.jar")) {
         rename { "gradle-plugin.jar" }
     }
 
diff --git a/plugin-api/plugin-builder/settings.gradle.kts b/plugin-api/plugin-builder/settings.gradle.kts
new file mode 100644
index 0000000000..b803f5ab99
--- /dev/null
+++ b/plugin-api/plugin-builder/settings.gradle.kts
@@ -0,0 +1,9 @@
+rootProject.name = "plugin-builder"
+
+dependencyResolutionManagement {
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 4b759afeb1..d4ecf1bd92 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -23,6 +23,9 @@ pluginManagement {
 	includeBuild("composite-builds/build-logic") {
 		name = "build-logic"
 	}
+	includeBuild("plugin-api/plugin-builder") {
+		name = "plugin-builder"
+	}
 
 	repositories {
 		gradlePluginPortal()
@@ -176,7 +179,6 @@ include(
 	":testing:tooling",
 	":testing:unit",
 	":plugin-api",
-	":plugin-api:plugin-builder",
 	":plugin-manager",
     ":llama-api",
     ":llama-impl"