diff --git a/spring-boot-project/spring-boot-tools/org.springframework.boot.gradle.plugin/pom.xml b/spring-boot-project/spring-boot-tools/org.springframework.boot.gradle.plugin/pom.xml
new file mode 100644
index 0000000000..754672d746
--- /dev/null
+++ b/spring-boot-project/spring-boot-tools/org.springframework.boot.gradle.plugin/pom.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-tools</artifactId>
+		<version>${revision}</version>
+	</parent>
+	<artifactId>org.springframework.boot.gradle.plugin</artifactId>
+	<packaging>pom</packaging>
+	<name>Spring Boot Gradle Plugin Marker Artifact</name>
+	<description>Spring Boot Gradle Plugin Marker Artifact</description>
+	<properties>
+		<main.basedir>${basedir}/../../..</main.basedir>
+	</properties>
+	<scm>
+		<url>${git.url}</url>
+		<connection>${git.connection}</connection>
+		<developerConnection>${git.developerConnection}</developerConnection>
+	</scm>
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-gradle-plugin</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>regex-property</id>
+						<goals>
+							<goal>regex-property</goal>
+						</goals>
+						<configuration>
+							<failIfNoMatch>false</failIfNoMatch>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/spring-boot-project/spring-boot-tools/pom.xml b/spring-boot-project/spring-boot-tools/pom.xml
index d478c8b63c..1dd0d293d6 100644
--- a/spring-boot-project/spring-boot-tools/pom.xml
+++ b/spring-boot-project/spring-boot-tools/pom.xml
@@ -20,6 +20,7 @@
 		<developerConnection>${git.developerConnection}</developerConnection>
 	</scm>
 	<modules>
+		<module>org.springframework.boot.gradle.plugin</module>
 		<module>spring-boot-antlib</module>
 		<module>spring-boot-autoconfigure-processor</module>
 		<module>spring-boot-configuration-docs</module>
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/getting-started/milestone-settings.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/getting-started/milestone-settings.gradle
index c4f8a907e3..a60b9e8c38 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/getting-started/milestone-settings.gradle
+++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/getting-started/milestone-settings.gradle
@@ -3,11 +3,4 @@ pluginManagement {
 		maven { url 'https://repo.spring.io/milestone' }
 		gradlePluginPortal()
 	}
-	resolutionStrategy {
-		eachPlugin {
-			if (requested.id.id == 'org.springframework.boot') {
-				useModule "org.springframework.boot:spring-boot-gradle-plugin:${requested.version}"
-			}
-		}
-	}
 }
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/getting-started/milestone-settings.gradle.kts b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/getting-started/milestone-settings.gradle.kts
index 700ce8a6a8..dbcd85bc52 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/getting-started/milestone-settings.gradle.kts
+++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/getting-started/milestone-settings.gradle.kts
@@ -3,11 +3,4 @@ pluginManagement {
 		maven { url = uri("https://repo.spring.io/milestone") }
 		gradlePluginPortal()
 	}
-	resolutionStrategy {
-		eachPlugin {
-			if (requested.id.id == "org.springframework.boot") {
-				useModule("org.springframework.boot:spring-boot-gradle-plugin:${requested.version}")
-			}
-		}
-	}
 }
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/getting-started/snapshot-settings.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/getting-started/snapshot-settings.gradle
index 559c8cc88f..a136406ac3 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/getting-started/snapshot-settings.gradle
+++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/getting-started/snapshot-settings.gradle
@@ -4,11 +4,4 @@ pluginManagement {
 		maven { url 'https://repo.spring.io/snapshot' }
 		gradlePluginPortal()
 	}
-	resolutionStrategy {
-		eachPlugin {
-			if (requested.id.id == 'org.springframework.boot') {
-				useModule "org.springframework.boot:spring-boot-gradle-plugin:${requested.version}"
-			}
-		}
-	}
 }
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/getting-started/snapshot-settings.gradle.kts b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/getting-started/snapshot-settings.gradle.kts
index ab94996559..d1600bcf22 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/getting-started/snapshot-settings.gradle.kts
+++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/getting-started/snapshot-settings.gradle.kts
@@ -4,11 +4,4 @@ pluginManagement {
 		maven { url = uri("https://repo.spring.io/snapshot") }
 		gradlePluginPortal()
 	}
-	resolutionStrategy {
-		eachPlugin {
-			if (requested.id.id == "org.springframework.boot") {
-				useModule("org.springframework.boot:spring-boot-gradle-plugin:${requested.version}")
-			}
-		}
-	}
 }