diff --git a/.gitignore b/.gitignore
index e5f0af67bde0..6d276115b4be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
 # Gradle
 .gradle
-/build/
-/*/build/
+build
 
 # Ignore Gradle GUI config
 gradle-app.setting
diff --git a/build.gradle.kts b/build.gradle.kts
index 5379f61f82be..0fc9203523f2 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,11 +1,11 @@
 plugins {
 	id("io.spring.nohttp")
 	id("io.github.gradle-nexus.publish-plugin")
-	`base-conventions`
-	`build-metadata`
-	`dependency-update-check`
-	`jacoco-aggregation-conventions`
-	`temp-maven-repo`
+	id("junitbuild.base-conventions")
+	id("junitbuild.build-metadata")
+	id("junitbuild.dependency-update-check")
+	id("junitbuild.jacoco-aggregation-conventions")
+	id("junitbuild.temp-maven-repo")
 }
 
 description = "JUnit 5"
@@ -61,5 +61,5 @@ nexusPublishing {
 }
 
 nohttp {
-	source.exclude("buildSrc/build/generated-sources/**")
+	source.exclude("**/.gradle/**", "gradle/plugins/build/generated-sources/**")
 }
diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
deleted file mode 100644
index 29744ec1bcde..000000000000
--- a/buildSrc/settings.gradle.kts
+++ /dev/null
@@ -1 +0,0 @@
-rootProject.name = "buildSrc"
diff --git a/buildSrc/src/main/kotlin/base-conventions.gradle.kts b/buildSrc/src/main/kotlin/base-conventions.gradle.kts
deleted file mode 100644
index 0c4c4c5f7a29..000000000000
--- a/buildSrc/src/main/kotlin/base-conventions.gradle.kts
+++ /dev/null
@@ -1,6 +0,0 @@
-plugins {
-	eclipse
-	idea
-	id("java-toolchain-conventions")
-	id("spotless-conventions")
-}
diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index 760c6c3d00d6..a357d9f2d421 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -2,9 +2,9 @@ import org.asciidoctor.gradle.base.AsciidoctorAttributeProvider
 import org.asciidoctor.gradle.jvm.AbstractAsciidoctorTask
 import org.gradle.api.tasks.PathSensitivity.RELATIVE
 import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
-import org.junit.gradle.exec.ClasspathSystemPropertyProvider
-import org.junit.gradle.exec.RunConsoleLauncher
-import org.junit.gradle.javadoc.ModuleSpecificJavadocFileOption
+import junitbuild.exec.ClasspathSystemPropertyProvider
+import junitbuild.exec.RunConsoleLauncher
+import junitbuild.javadoc.ModuleSpecificJavadocFileOption
 import java.io.ByteArrayOutputStream
 import java.nio.file.Files
 
@@ -12,7 +12,7 @@ plugins {
 	id("org.asciidoctor.jvm.convert")
 	id("org.asciidoctor.jvm.pdf")
 	id("org.ajoberstar.git-publish")
-	`kotlin-library-conventions`
+	id("junitbuild.kotlin-library-conventions")
 }
 
 val modularProjects: List<Project> by rootProject
diff --git a/buildSrc/build.gradle.kts b/gradle/plugins/build.gradle.kts
similarity index 94%
rename from buildSrc/build.gradle.kts
rename to gradle/plugins/build.gradle.kts
index 4ffac612a5b4..5afee3e2d70d 100644
--- a/buildSrc/build.gradle.kts
+++ b/gradle/plugins/build.gradle.kts
@@ -20,11 +20,11 @@ dependencies {
 
 tasks {
 	withType<JavaCompile>().configureEach {
-		options.release.set(8)
+		options.release.set(11)
 	}
 	withType<KotlinCompile>().configureEach {
 		kotlinOptions {
-			jvmTarget = "1.8"
+			jvmTarget = "11"
 			allWarningsAsErrors = true
 		}
 	}
diff --git a/gradle/plugins/settings.gradle.kts b/gradle/plugins/settings.gradle.kts
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/buildSrc/src/main/kotlin/JavaLibraryExtension.kt b/gradle/plugins/src/main/kotlin/JavaLibraryExtension.kt
similarity index 100%
rename from buildSrc/src/main/kotlin/JavaLibraryExtension.kt
rename to gradle/plugins/src/main/kotlin/JavaLibraryExtension.kt
diff --git a/buildSrc/src/main/kotlin/License.kt b/gradle/plugins/src/main/kotlin/License.kt
similarity index 100%
rename from buildSrc/src/main/kotlin/License.kt
rename to gradle/plugins/src/main/kotlin/License.kt
diff --git a/buildSrc/src/main/kotlin/ProjectExtensions.kt b/gradle/plugins/src/main/kotlin/ProjectExtensions.kt
similarity index 100%
rename from buildSrc/src/main/kotlin/ProjectExtensions.kt
rename to gradle/plugins/src/main/kotlin/ProjectExtensions.kt
diff --git a/buildSrc/src/main/kotlin/TaskExtensions.kt b/gradle/plugins/src/main/kotlin/TaskExtensions.kt
similarity index 100%
rename from buildSrc/src/main/kotlin/TaskExtensions.kt
rename to gradle/plugins/src/main/kotlin/TaskExtensions.kt
diff --git a/gradle/plugins/src/main/kotlin/junitbuild.base-conventions.gradle.kts b/gradle/plugins/src/main/kotlin/junitbuild.base-conventions.gradle.kts
new file mode 100644
index 000000000000..4bd5a4660201
--- /dev/null
+++ b/gradle/plugins/src/main/kotlin/junitbuild.base-conventions.gradle.kts
@@ -0,0 +1,6 @@
+plugins {
+	eclipse
+	idea
+	id("junitbuild.java-toolchain-conventions")
+	id("junitbuild.spotless-conventions")
+}
diff --git a/buildSrc/src/main/kotlin/build-metadata.gradle.kts b/gradle/plugins/src/main/kotlin/junitbuild.build-metadata.gradle.kts
similarity index 100%
rename from buildSrc/src/main/kotlin/build-metadata.gradle.kts
rename to gradle/plugins/src/main/kotlin/junitbuild.build-metadata.gradle.kts
diff --git a/buildSrc/src/main/kotlin/dependency-update-check.gradle.kts b/gradle/plugins/src/main/kotlin/junitbuild.dependency-update-check.gradle.kts
similarity index 100%
rename from buildSrc/src/main/kotlin/dependency-update-check.gradle.kts
rename to gradle/plugins/src/main/kotlin/junitbuild.dependency-update-check.gradle.kts
diff --git a/buildSrc/src/main/kotlin/jacoco-aggregation-conventions.gradle.kts b/gradle/plugins/src/main/kotlin/junitbuild.jacoco-aggregation-conventions.gradle.kts
similarity index 90%
rename from buildSrc/src/main/kotlin/jacoco-aggregation-conventions.gradle.kts
rename to gradle/plugins/src/main/kotlin/junitbuild.jacoco-aggregation-conventions.gradle.kts
index cd32b2d65517..e611a9f622d1 100644
--- a/buildSrc/src/main/kotlin/jacoco-aggregation-conventions.gradle.kts
+++ b/gradle/plugins/src/main/kotlin/junitbuild.jacoco-aggregation-conventions.gradle.kts
@@ -4,7 +4,7 @@ import org.gradle.kotlin.dsl.`jacoco-report-aggregation`
 import org.gradle.testing.jacoco.plugins.JacocoCoverageReport
 
 plugins {
-	id("jacoco-conventions")
+	id("junitbuild.jacoco-conventions")
 	`jacoco-report-aggregation`
 }
 
diff --git a/buildSrc/src/main/kotlin/jacoco-conventions.gradle.kts b/gradle/plugins/src/main/kotlin/junitbuild.jacoco-conventions.gradle.kts
similarity index 100%
rename from buildSrc/src/main/kotlin/jacoco-conventions.gradle.kts
rename to gradle/plugins/src/main/kotlin/junitbuild.jacoco-conventions.gradle.kts
diff --git a/buildSrc/src/main/kotlin/jacoco-java-conventions.gradle.kts b/gradle/plugins/src/main/kotlin/junitbuild.jacoco-java-conventions.gradle.kts
similarity index 95%
rename from buildSrc/src/main/kotlin/jacoco-java-conventions.gradle.kts
rename to gradle/plugins/src/main/kotlin/junitbuild.jacoco-java-conventions.gradle.kts
index 265ff8937069..42f7c754fd4e 100644
--- a/buildSrc/src/main/kotlin/jacoco-java-conventions.gradle.kts
+++ b/gradle/plugins/src/main/kotlin/junitbuild.jacoco-java-conventions.gradle.kts
@@ -3,7 +3,7 @@ import org.gradle.api.attributes.LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE
 
 plugins {
 	java
-	id("jacoco-conventions")
+	id("junitbuild.jacoco-conventions")
 }
 
 val mavenizedProjects: List<Project> by rootProject.extra
diff --git a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts b/gradle/plugins/src/main/kotlin/junitbuild.java-library-conventions.gradle.kts
similarity index 96%
rename from buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
rename to gradle/plugins/src/main/kotlin/junitbuild.java-library-conventions.gradle.kts
index e2df86c8984f..bb586e37605c 100644
--- a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
+++ b/gradle/plugins/src/main/kotlin/junitbuild.java-library-conventions.gradle.kts
@@ -1,14 +1,14 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-import org.junit.gradle.java.ModulePathArgumentProvider
-import org.junit.gradle.java.PatchModuleArgumentProvider
+import junitbuild.java.ModulePathArgumentProvider
+import junitbuild.java.PatchModuleArgumentProvider
 
 plugins {
 	`java-library`
 	eclipse
 	idea
 	checkstyle
-	id("base-conventions")
-	id("jacoco-java-conventions")
+	id("junitbuild.base-conventions")
+	id("junitbuild.jacoco-java-conventions")
 }
 
 val mavenizedProjects: List<Project> by rootProject.extra
@@ -42,8 +42,8 @@ java {
 
 if (project in mavenizedProjects) {
 
-	apply(plugin = "publishing-conventions")
-	apply(plugin = "osgi-conventions")
+	apply(plugin = "junitbuild.publishing-conventions")
+	apply(plugin = "junitbuild.osgi-conventions")
 
 	java {
 		withJavadocJar()
diff --git a/buildSrc/src/main/kotlin/java-multi-release-sources.gradle.kts b/gradle/plugins/src/main/kotlin/junitbuild.java-multi-release-sources.gradle.kts
similarity index 96%
rename from buildSrc/src/main/kotlin/java-multi-release-sources.gradle.kts
rename to gradle/plugins/src/main/kotlin/junitbuild.java-multi-release-sources.gradle.kts
index fb71c3e95003..7f2af9d50e7e 100644
--- a/buildSrc/src/main/kotlin/java-multi-release-sources.gradle.kts
+++ b/gradle/plugins/src/main/kotlin/junitbuild.java-multi-release-sources.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-	id("java-library-conventions")
+	id("junitbuild.java-library-conventions")
 }
 
 val mavenizedProjects: List<Project> by rootProject.extra
diff --git a/buildSrc/src/main/kotlin/java-repackage-jars.gradle.kts b/gradle/plugins/src/main/kotlin/junitbuild.java-repackage-jars.gradle.kts
similarity index 100%
rename from buildSrc/src/main/kotlin/java-repackage-jars.gradle.kts
rename to gradle/plugins/src/main/kotlin/junitbuild.java-repackage-jars.gradle.kts
diff --git a/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts b/gradle/plugins/src/main/kotlin/junitbuild.java-toolchain-conventions.gradle.kts
similarity index 100%
rename from buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
rename to gradle/plugins/src/main/kotlin/junitbuild.java-toolchain-conventions.gradle.kts
diff --git a/buildSrc/src/main/kotlin/junit4-compatibility.gradle.kts b/gradle/plugins/src/main/kotlin/junitbuild.junit4-compatibility.gradle.kts
similarity index 90%
rename from buildSrc/src/main/kotlin/junit4-compatibility.gradle.kts
rename to gradle/plugins/src/main/kotlin/junitbuild.junit4-compatibility.gradle.kts
index 89ca169b699e..e43c938e5ca4 100644
--- a/buildSrc/src/main/kotlin/junit4-compatibility.gradle.kts
+++ b/gradle/plugins/src/main/kotlin/junitbuild.junit4-compatibility.gradle.kts
@@ -12,7 +12,7 @@ dependencies {
 			strictly("4.12")
 		}
 	}
-	pluginManager.withPlugin("osgi-conventions") {
+	pluginManager.withPlugin("junitbuild.osgi-conventions") {
 		val junit4Osgi = requiredVersionFromLibs("junit4Osgi")
 		"osgiVerification"("org.apache.servicemix.bundles:org.apache.servicemix.bundles.junit:${junit4Osgi}")
 	}
diff --git a/buildSrc/src/main/kotlin/kotlin-library-conventions.gradle.kts b/gradle/plugins/src/main/kotlin/junitbuild.kotlin-library-conventions.gradle.kts
similarity index 92%
rename from buildSrc/src/main/kotlin/kotlin-library-conventions.gradle.kts
rename to gradle/plugins/src/main/kotlin/junitbuild.kotlin-library-conventions.gradle.kts
index 163190944bae..bfb33224a709 100644
--- a/buildSrc/src/main/kotlin/kotlin-library-conventions.gradle.kts
+++ b/gradle/plugins/src/main/kotlin/junitbuild.kotlin-library-conventions.gradle.kts
@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-	id("java-library-conventions")
+	id("junitbuild.java-library-conventions")
 	kotlin("jvm")
 }
 
diff --git a/buildSrc/src/main/kotlin/osgi-conventions.gradle.kts b/gradle/plugins/src/main/kotlin/junitbuild.osgi-conventions.gradle.kts
similarity index 100%
rename from buildSrc/src/main/kotlin/osgi-conventions.gradle.kts
rename to gradle/plugins/src/main/kotlin/junitbuild.osgi-conventions.gradle.kts
diff --git a/buildSrc/src/main/kotlin/publishing-conventions.gradle.kts b/gradle/plugins/src/main/kotlin/junitbuild.publishing-conventions.gradle.kts
similarity index 98%
rename from buildSrc/src/main/kotlin/publishing-conventions.gradle.kts
rename to gradle/plugins/src/main/kotlin/junitbuild.publishing-conventions.gradle.kts
index c4e28d5bb3a9..7f8b617b3084 100644
--- a/buildSrc/src/main/kotlin/publishing-conventions.gradle.kts
+++ b/gradle/plugins/src/main/kotlin/junitbuild.publishing-conventions.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
 	`maven-publish`
 	signing
-	id("base-conventions")
+	id("junitbuild.base-conventions")
 }
 
 val isSnapshot = project.version.toString().contains("SNAPSHOT")
diff --git a/buildSrc/src/main/kotlin/shadow-conventions.gradle.kts b/gradle/plugins/src/main/kotlin/junitbuild.shadow-conventions.gradle.kts
similarity index 96%
rename from buildSrc/src/main/kotlin/shadow-conventions.gradle.kts
rename to gradle/plugins/src/main/kotlin/junitbuild.shadow-conventions.gradle.kts
index 19028422c41e..d9f93aa3839d 100644
--- a/buildSrc/src/main/kotlin/shadow-conventions.gradle.kts
+++ b/gradle/plugins/src/main/kotlin/junitbuild.shadow-conventions.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-	id("java-library-conventions")
+	id("junitbuild.java-library-conventions")
 	id("com.github.johnrengelman.shadow")
 }
 
diff --git a/buildSrc/src/main/kotlin/spotless-conventions.gradle.kts b/gradle/plugins/src/main/kotlin/junitbuild.spotless-conventions.gradle.kts
similarity index 100%
rename from buildSrc/src/main/kotlin/spotless-conventions.gradle.kts
rename to gradle/plugins/src/main/kotlin/junitbuild.spotless-conventions.gradle.kts
diff --git a/buildSrc/src/main/kotlin/temp-maven-repo.gradle.kts b/gradle/plugins/src/main/kotlin/junitbuild.temp-maven-repo.gradle.kts
similarity index 100%
rename from buildSrc/src/main/kotlin/temp-maven-repo.gradle.kts
rename to gradle/plugins/src/main/kotlin/junitbuild.temp-maven-repo.gradle.kts
diff --git a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts b/gradle/plugins/src/main/kotlin/junitbuild.testing-conventions.gradle.kts
similarity index 100%
rename from buildSrc/src/main/kotlin/testing-conventions.gradle.kts
rename to gradle/plugins/src/main/kotlin/junitbuild.testing-conventions.gradle.kts
diff --git a/buildSrc/src/main/kotlin/org/junit/gradle/exec/ClasspathSystemPropertyProvider.kt b/gradle/plugins/src/main/kotlin/junitbuild/exec/ClasspathSystemPropertyProvider.kt
similarity index 92%
rename from buildSrc/src/main/kotlin/org/junit/gradle/exec/ClasspathSystemPropertyProvider.kt
rename to gradle/plugins/src/main/kotlin/junitbuild/exec/ClasspathSystemPropertyProvider.kt
index 9c6423dca171..2faeb2acaeef 100644
--- a/buildSrc/src/main/kotlin/org/junit/gradle/exec/ClasspathSystemPropertyProvider.kt
+++ b/gradle/plugins/src/main/kotlin/junitbuild/exec/ClasspathSystemPropertyProvider.kt
@@ -1,4 +1,4 @@
-package org.junit.gradle.exec
+package junitbuild.exec
 
 import org.gradle.api.file.FileCollection
 import org.gradle.api.tasks.Classpath
diff --git a/buildSrc/src/main/kotlin/org/junit/gradle/exec/RunConsoleLauncher.kt b/gradle/plugins/src/main/kotlin/junitbuild/exec/RunConsoleLauncher.kt
similarity index 98%
rename from buildSrc/src/main/kotlin/org/junit/gradle/exec/RunConsoleLauncher.kt
rename to gradle/plugins/src/main/kotlin/junitbuild/exec/RunConsoleLauncher.kt
index 88889bcfbb1f..4ba265061662 100644
--- a/buildSrc/src/main/kotlin/org/junit/gradle/exec/RunConsoleLauncher.kt
+++ b/gradle/plugins/src/main/kotlin/junitbuild/exec/RunConsoleLauncher.kt
@@ -1,4 +1,4 @@
-package org.junit.gradle.exec
+package junitbuild.exec
 
 import org.gradle.api.DefaultTask
 import org.gradle.api.file.ConfigurableFileCollection
diff --git a/buildSrc/src/main/kotlin/org/junit/gradle/java/ExecJarAction.kt b/gradle/plugins/src/main/kotlin/junitbuild/java/ExecJarAction.kt
similarity index 96%
rename from buildSrc/src/main/kotlin/org/junit/gradle/java/ExecJarAction.kt
rename to gradle/plugins/src/main/kotlin/junitbuild/java/ExecJarAction.kt
index afc97f404fcc..a900b9c646c3 100644
--- a/buildSrc/src/main/kotlin/org/junit/gradle/java/ExecJarAction.kt
+++ b/gradle/plugins/src/main/kotlin/junitbuild/java/ExecJarAction.kt
@@ -1,4 +1,4 @@
-package org.junit.gradle.java
+package junitbuild.java
 
 import org.gradle.api.Action
 import org.gradle.api.Task
diff --git a/buildSrc/src/main/kotlin/org/junit/gradle/java/ModulePathArgumentProvider.kt b/gradle/plugins/src/main/kotlin/junitbuild/java/ModulePathArgumentProvider.kt
similarity index 97%
rename from buildSrc/src/main/kotlin/org/junit/gradle/java/ModulePathArgumentProvider.kt
rename to gradle/plugins/src/main/kotlin/junitbuild/java/ModulePathArgumentProvider.kt
index adb478c42f82..3133c35a2ead 100644
--- a/buildSrc/src/main/kotlin/org/junit/gradle/java/ModulePathArgumentProvider.kt
+++ b/gradle/plugins/src/main/kotlin/junitbuild/java/ModulePathArgumentProvider.kt
@@ -1,4 +1,4 @@
-package org.junit.gradle.java
+package junitbuild.java
 
 import org.gradle.api.Named
 import org.gradle.api.Project
diff --git a/buildSrc/src/main/kotlin/org/junit/gradle/java/PatchModuleArgumentProvider.kt b/gradle/plugins/src/main/kotlin/junitbuild/java/PatchModuleArgumentProvider.kt
similarity index 98%
rename from buildSrc/src/main/kotlin/org/junit/gradle/java/PatchModuleArgumentProvider.kt
rename to gradle/plugins/src/main/kotlin/junitbuild/java/PatchModuleArgumentProvider.kt
index f13fd8b9a83b..93210bfc41a7 100644
--- a/buildSrc/src/main/kotlin/org/junit/gradle/java/PatchModuleArgumentProvider.kt
+++ b/gradle/plugins/src/main/kotlin/junitbuild/java/PatchModuleArgumentProvider.kt
@@ -1,4 +1,4 @@
-package org.junit.gradle.java
+package junitbuild.java
 
 import javaModuleName
 import org.gradle.api.Named
diff --git a/buildSrc/src/main/kotlin/org/junit/gradle/java/WriteArtifactsFile.kt b/gradle/plugins/src/main/kotlin/junitbuild/java/WriteArtifactsFile.kt
similarity index 97%
rename from buildSrc/src/main/kotlin/org/junit/gradle/java/WriteArtifactsFile.kt
rename to gradle/plugins/src/main/kotlin/junitbuild/java/WriteArtifactsFile.kt
index 12107fc8f824..d0b56930cf08 100644
--- a/buildSrc/src/main/kotlin/org/junit/gradle/java/WriteArtifactsFile.kt
+++ b/gradle/plugins/src/main/kotlin/junitbuild/java/WriteArtifactsFile.kt
@@ -1,4 +1,4 @@
-package org.junit.gradle.java
+package junitbuild.java
 
 import org.gradle.api.DefaultTask
 import org.gradle.api.artifacts.Configuration
diff --git a/buildSrc/src/main/kotlin/org/junit/gradle/javadoc/ModuleSpecificJavadocFileOption.kt b/gradle/plugins/src/main/kotlin/junitbuild/javadoc/ModuleSpecificJavadocFileOption.kt
similarity index 96%
rename from buildSrc/src/main/kotlin/org/junit/gradle/javadoc/ModuleSpecificJavadocFileOption.kt
rename to gradle/plugins/src/main/kotlin/junitbuild/javadoc/ModuleSpecificJavadocFileOption.kt
index e9391b22d1b8..f4c6f124b65e 100644
--- a/buildSrc/src/main/kotlin/org/junit/gradle/javadoc/ModuleSpecificJavadocFileOption.kt
+++ b/gradle/plugins/src/main/kotlin/junitbuild/javadoc/ModuleSpecificJavadocFileOption.kt
@@ -1,4 +1,4 @@
-package org.junit.gradle.javadoc
+package junitbuild.javadoc
 
 import org.gradle.external.javadoc.JavadocOptionFileOption
 import org.gradle.external.javadoc.internal.JavadocOptionFileWriterContext
diff --git a/junit-bom/junit-bom.gradle.kts b/junit-bom/junit-bom.gradle.kts
index fae23ee37eab..485bb50d2ea3 100644
--- a/junit-bom/junit-bom.gradle.kts
+++ b/junit-bom/junit-bom.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
 	`java-platform`
-	`publishing-conventions`
+	id("junitbuild.publishing-conventions")
 }
 
 description = "${rootProject.description} (Bill of Materials)"
diff --git a/junit-jupiter-api/junit-jupiter-api.gradle.kts b/junit-jupiter-api/junit-jupiter-api.gradle.kts
index d28dec7bf358..e4f2869ae39f 100644
--- a/junit-jupiter-api/junit-jupiter-api.gradle.kts
+++ b/junit-jupiter-api/junit-jupiter-api.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-	`kotlin-library-conventions`
+	id("junitbuild.kotlin-library-conventions")
 	`java-test-fixtures`
 }
 
diff --git a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
index e15a42bf136e..7ce27bcf32e7 100644
--- a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
+++ b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
@@ -1,8 +1,8 @@
 import org.gradle.api.tasks.PathSensitivity.RELATIVE
 
 plugins {
-	`kotlin-library-conventions`
-	`testing-conventions`
+	id("junitbuild.kotlin-library-conventions")
+	id("junitbuild.testing-conventions")
 	groovy
 	`java-test-fixtures`
 }
diff --git a/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts b/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts
index ff570cc7c87c..e9b8e0c049fd 100644
--- a/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts
+++ b/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
-	`java-library-conventions`
-	`junit4-compatibility`
-	`testing-conventions`
+	id("junitbuild.java-library-conventions")
+	id("junitbuild.junit4-compatibility")
+	id("junitbuild.testing-conventions")
 }
 
 description = "JUnit Jupiter Migration Support"
diff --git a/junit-jupiter-params/junit-jupiter-params.gradle.kts b/junit-jupiter-params/junit-jupiter-params.gradle.kts
index 528ef09c7435..44e065e118ed 100644
--- a/junit-jupiter-params/junit-jupiter-params.gradle.kts
+++ b/junit-jupiter-params/junit-jupiter-params.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
-	`kotlin-library-conventions`
-	`shadow-conventions`
-	`testing-conventions`
+	id("junitbuild.kotlin-library-conventions")
+	id("junitbuild.shadow-conventions")
+	id("junitbuild.testing-conventions")
 }
 
 description = "JUnit Jupiter Params"
diff --git a/junit-jupiter/junit-jupiter.gradle.kts b/junit-jupiter/junit-jupiter.gradle.kts
index 181698f09437..83230d0b4226 100644
--- a/junit-jupiter/junit-jupiter.gradle.kts
+++ b/junit-jupiter/junit-jupiter.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-	`java-library-conventions`
+	id("junitbuild.java-library-conventions")
 }
 
 description = "JUnit Jupiter (Aggregator)"
diff --git a/junit-platform-commons/junit-platform-commons.gradle.kts b/junit-platform-commons/junit-platform-commons.gradle.kts
index 393d655e86d7..3ffc32815fb2 100644
--- a/junit-platform-commons/junit-platform-commons.gradle.kts
+++ b/junit-platform-commons/junit-platform-commons.gradle.kts
@@ -1,9 +1,9 @@
-import org.junit.gradle.java.ExecJarAction
+import junitbuild.java.ExecJarAction
 
 plugins {
-	`java-library-conventions`
-	`java-multi-release-sources`
-	`java-repackage-jars`
+	id("junitbuild.java-library-conventions")
+	id("junitbuild.java-multi-release-sources")
+	id("junitbuild.java-repackage-jars")
 	`java-test-fixtures`
 }
 
diff --git a/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts b/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts
index 6a42539e5a98..61d35dedab17 100644
--- a/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts
+++ b/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts
@@ -1,8 +1,8 @@
-import org.junit.gradle.java.WriteArtifactsFile
+import junitbuild.java.WriteArtifactsFile
 
 plugins {
-	`java-library-conventions`
-	`shadow-conventions`
+	id("junitbuild.java-library-conventions")
+	id("junitbuild.shadow-conventions")
 }
 
 description = "JUnit Platform Console Standalone"
diff --git a/junit-platform-console/junit-platform-console.gradle.kts b/junit-platform-console/junit-platform-console.gradle.kts
index 6006a8c880af..d7bec605761e 100644
--- a/junit-platform-console/junit-platform-console.gradle.kts
+++ b/junit-platform-console/junit-platform-console.gradle.kts
@@ -1,8 +1,8 @@
 plugins {
-	`java-library-conventions`
-	`shadow-conventions`
-	`java-multi-release-sources`
-	`java-repackage-jars`
+	id("junitbuild.java-library-conventions")
+	id("junitbuild.shadow-conventions")
+	id("junitbuild.java-multi-release-sources")
+	id("junitbuild.java-repackage-jars")
 }
 
 description = "JUnit Platform Console"
@@ -38,7 +38,7 @@ tasks {
 			into("META-INF")
 		}
 		from(sourceSets.mainRelease9.get().output.classesDirs)
-		doLast(objects.newInstance(org.junit.gradle.java.ExecJarAction::class).apply {
+		doLast(objects.newInstance(junitbuild.java.ExecJarAction::class).apply {
 			javaLauncher.set(project.javaToolchains.launcherFor(java.toolchain))
 			args.addAll(
 				"--update",
diff --git a/junit-platform-engine/junit-platform-engine.gradle.kts b/junit-platform-engine/junit-platform-engine.gradle.kts
index 6c780cea7658..416b227b00c1 100644
--- a/junit-platform-engine/junit-platform-engine.gradle.kts
+++ b/junit-platform-engine/junit-platform-engine.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-	`java-library-conventions`
+	id("junitbuild.java-library-conventions")
 	`java-test-fixtures`
 }
 
diff --git a/junit-platform-jfr/junit-platform-jfr.gradle.kts b/junit-platform-jfr/junit-platform-jfr.gradle.kts
index 00198d86a540..c0df2b512652 100644
--- a/junit-platform-jfr/junit-platform-jfr.gradle.kts
+++ b/junit-platform-jfr/junit-platform-jfr.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-	`java-library-conventions`
+	id("junitbuild.java-library-conventions")
 }
 
 description = "JUnit Platform Flight Recorder Support"
diff --git a/junit-platform-launcher/junit-platform-launcher.gradle.kts b/junit-platform-launcher/junit-platform-launcher.gradle.kts
index d51d0df34677..228ecb35b734 100644
--- a/junit-platform-launcher/junit-platform-launcher.gradle.kts
+++ b/junit-platform-launcher/junit-platform-launcher.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-	`java-library-conventions`
+	id("junitbuild.java-library-conventions")
 	`java-test-fixtures`
 }
 
diff --git a/junit-platform-reporting/junit-platform-reporting.gradle.kts b/junit-platform-reporting/junit-platform-reporting.gradle.kts
index 144c3fbe5bbc..84eb0fa0f75c 100644
--- a/junit-platform-reporting/junit-platform-reporting.gradle.kts
+++ b/junit-platform-reporting/junit-platform-reporting.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-	`java-library-conventions`
-	`shadow-conventions`
+	id("junitbuild.java-library-conventions")
+	id("junitbuild.shadow-conventions")
 }
 
 description = "JUnit Platform Reporting"
diff --git a/junit-platform-runner/junit-platform-runner.gradle.kts b/junit-platform-runner/junit-platform-runner.gradle.kts
index 78205ecebbed..c62d027f6c67 100644
--- a/junit-platform-runner/junit-platform-runner.gradle.kts
+++ b/junit-platform-runner/junit-platform-runner.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-	`java-library-conventions`
-	`junit4-compatibility`
+	id("junitbuild.java-library-conventions")
+	id("junitbuild.junit4-compatibility")
 }
 
 description = "JUnit Platform Runner"
diff --git a/junit-platform-suite-api/junit-platform-suite-api.gradle.kts b/junit-platform-suite-api/junit-platform-suite-api.gradle.kts
index 7be1b0a2a9ce..cc5eb1d08bb7 100644
--- a/junit-platform-suite-api/junit-platform-suite-api.gradle.kts
+++ b/junit-platform-suite-api/junit-platform-suite-api.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-	`java-library-conventions`
+	id("junitbuild.java-library-conventions")
 }
 
 description = "JUnit Platform Suite API"
diff --git a/junit-platform-suite-commons/junit-platform-suite-commons.gradle.kts b/junit-platform-suite-commons/junit-platform-suite-commons.gradle.kts
index 8f578b0b9c30..f65b677db193 100644
--- a/junit-platform-suite-commons/junit-platform-suite-commons.gradle.kts
+++ b/junit-platform-suite-commons/junit-platform-suite-commons.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-	`java-library-conventions`
+	id("junitbuild.java-library-conventions")
 }
 
 description = "JUnit Platform Suite Commons"
diff --git a/junit-platform-suite-engine/junit-platform-suite-engine.gradle.kts b/junit-platform-suite-engine/junit-platform-suite-engine.gradle.kts
index 12e7f6746752..36abcdbc088d 100644
--- a/junit-platform-suite-engine/junit-platform-suite-engine.gradle.kts
+++ b/junit-platform-suite-engine/junit-platform-suite-engine.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-	`java-library-conventions`
+	id("junitbuild.java-library-conventions")
 }
 
 description = "JUnit Platform Suite Engine"
diff --git a/junit-platform-suite/junit-platform-suite.gradle.kts b/junit-platform-suite/junit-platform-suite.gradle.kts
index 8615483d2723..83e475a2a689 100644
--- a/junit-platform-suite/junit-platform-suite.gradle.kts
+++ b/junit-platform-suite/junit-platform-suite.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-	`java-library-conventions`
+	id("junitbuild.java-library-conventions")
 }
 
 description = "JUnit Platform Suite (Aggregator)"
diff --git a/junit-platform-testkit/junit-platform-testkit.gradle.kts b/junit-platform-testkit/junit-platform-testkit.gradle.kts
index 6a574bcf3882..38e89344db34 100644
--- a/junit-platform-testkit/junit-platform-testkit.gradle.kts
+++ b/junit-platform-testkit/junit-platform-testkit.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-	`java-library-conventions`
+	id("junitbuild.java-library-conventions")
 }
 
 description = "JUnit Platform Test Kit"
diff --git a/junit-vintage-engine/junit-vintage-engine.gradle.kts b/junit-vintage-engine/junit-vintage-engine.gradle.kts
index b92fffa50337..9f68f7de0475 100644
--- a/junit-vintage-engine/junit-vintage-engine.gradle.kts
+++ b/junit-vintage-engine/junit-vintage-engine.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
-	`java-library-conventions`
-	`junit4-compatibility`
-	`testing-conventions`
+	id("junitbuild.java-library-conventions")
+	id("junitbuild.junit4-compatibility")
+	id("junitbuild.testing-conventions")
 	`java-test-fixtures`
 	groovy
 }
diff --git a/platform-tests/platform-tests.gradle.kts b/platform-tests/platform-tests.gradle.kts
index cca78db6b588..7ec818dc927f 100644
--- a/platform-tests/platform-tests.gradle.kts
+++ b/platform-tests/platform-tests.gradle.kts
@@ -3,9 +3,9 @@ import org.gradle.api.tasks.PathSensitivity.RELATIVE
 import org.gradle.internal.os.OperatingSystem
 
 plugins {
-	`java-library-conventions`
-	`junit4-compatibility`
-	`testing-conventions`
+	id("junitbuild.java-library-conventions")
+	id("junitbuild.junit4-compatibility")
+	id("junitbuild.testing-conventions")
 	id("me.champeau.jmh")
 }
 
diff --git a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
index f594af846257..61bec5e11ec0 100644
--- a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
+++ b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
@@ -2,8 +2,8 @@ import org.gradle.api.tasks.PathSensitivity.RELATIVE
 import org.gradle.jvm.toolchain.internal.NoToolchainAvailableException
 
 plugins {
-	`kotlin-library-conventions`
-	`testing-conventions`
+	id("junitbuild.kotlin-library-conventions")
+	id("junitbuild.testing-conventions")
 }
 
 javaLibrary {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 4270d9d8df17..96269d277097 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -2,6 +2,7 @@ import com.gradle.enterprise.gradleplugin.internal.extension.BuildScanExtensionW
 
 pluginManagement {
 	repositories {
+		includeBuild("gradle/plugins")
 		gradlePluginPortal()
 	}
 	plugins {