diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle
index b6f536097c2..db95d647ee6 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle
+++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle
@@ -50,6 +50,13 @@ syncDocumentationSourceForAsciidoctor {
 	}
 }
 
+tasks.withType(org.asciidoctor.gradle.jvm.AbstractAsciidoctorTask) {
+	doFirst {
+		def versionEl = version.split("\\.")
+		attributes "spring-boot-xsd-version": versionEl[0] + '.' + versionEl[1]
+	}
+}
+
 asciidoctor {
 	sources {
 		include "index.adoc"
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/asciidoc/packaging.adoc b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/asciidoc/packaging.adoc
index bd36b5a7594..32bff8f1d82 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/asciidoc/packaging.adoc
+++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/asciidoc/packaging.adoc
@@ -144,7 +144,7 @@ The following example shows what the implicit layer configuration described abov
 <layers-configuration xmlns="http://www.springframework.org/schema/boot/layers"
 					  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 					  xsi:schemaLocation="http://www.springframework.org/schema/boot/layers
-                      https://www.springframework.org/schema/boot/layers/layers-configuration.xsd">
+                      https://www.springframework.org/schema/boot/layers/layers-configuration-{spring-boot-xsd-version}.xsd">
 	<layers>
 		<layer>dependencies</layer>
 		<layer>snapshot-dependencies</layer>
@@ -554,7 +554,7 @@ This allows to reuse the cache for external dependencies when an internal depend
 	<layers-configuration xmlns="http://www.springframework.org/schema/boot/layers"
 						  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 						  xsi:schemaLocation="http://www.springframework.org/schema/boot/layers
-						  https://www.springframework.org/schema/boot/layers/layers-configuration.xsd">
+						  https://www.springframework.org/schema/boot/layers/layers-configuration-{spring-boot-xsd-version}.xsd">
 		<layers>
 			<layer>application</layer>
 			<layer>resources</layer>
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/jar-layered-custom/jar/src/layers.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/jar-layered-custom/jar/src/layers.xml
index 8253c18ea23..07593370481 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/jar-layered-custom/jar/src/layers.xml
+++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/jar-layered-custom/jar/src/layers.xml
@@ -1,7 +1,7 @@
 <layers-configuration xmlns="http://www.springframework.org/schema/boot/layers"
 					  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 					  xsi:schemaLocation="http://www.springframework.org/schema/boot/layers
-					  https://www.springframework.org/schema/layers/layers-configuration.xsd">
+					  https://www.springframework.org/schema/layers/layers-configuration-2.3.xsd">
 	<layers>
 		<layer>configuration</layer>
 		<layer>application</layer>
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/xsd/layers-configuration.xsd b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/xsd/layers-configuration-2.3.xsd
similarity index 100%
rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/xsd/layers-configuration.xsd
rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/xsd/layers-configuration-2.3.xsd
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/resources/layers.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/resources/layers.xml
index 344e5b7f30d..3e1bf3df498 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/resources/layers.xml
+++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/resources/layers.xml
@@ -1,7 +1,7 @@
 <layers-configuration xmlns="http://www.springframework.org/schema/boot/layers"
 					  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 					  xsi:schemaLocation="http://www.springframework.org/schema/boot/layers
-					  https://www.springframework.org/schema/boot/layers/layers-configuration.xsd">
+					  https://www.springframework.org/schema/boot/layers/layers-configuration-2.3.xsd">
 	<layers>
 		<layer>configuration</layer>
 		<layer>application</layer>
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/resources/library-layer-no-filter.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/resources/library-layer-no-filter.xml
index a09440498fc..8dabc5eb881 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/resources/library-layer-no-filter.xml
+++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/resources/library-layer-no-filter.xml
@@ -1,7 +1,7 @@
 <layers-configuration xmlns="http://www.springframework.org/schema/boot/layers"
 					  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 					  xsi:schemaLocation="http://www.springframework.org/schema/boot/layers
-					  https://www.springframework.org/schema/boot/layers/layers-configuration.xsd">
+					  https://www.springframework.org/schema/boot/layers/layers-configuration-2.3.xsd">
 	<layers>
 		<layer>my-deps</layer>
 	</layers>
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/resources/resource-layer-no-filter.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/resources/resource-layer-no-filter.xml
index 14a95b0280e..700eb37af42 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/resources/resource-layer-no-filter.xml
+++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/resources/resource-layer-no-filter.xml
@@ -1,7 +1,7 @@
 <layers-configuration xmlns="http://www.springframework.org/schema/boot/layers"
 					  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 					  xsi:schemaLocation="http://www.springframework.org/schema/boot/layers
-					  https://www.springframework.org/schema/boot/layers/layers-configuration.xsd">
+					  https://www.springframework.org/schema/boot/layers/layers-configuration-2.3.xsd">
 	<layers>
 		<layer>my-layer</layer>
 	</layers>