diff --git a/parent/pom.xml b/parent/pom.xml
index f20cb4d9..67575da2 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -128,6 +128,7 @@
 		<smallrye-mutiny>1.4.0</smallrye-mutiny>
 		<slf4j>1.7.32</slf4j>
 		<spring>5.3.27</spring>
+		<spring-asciidoctor-backends.version>0.0.5</spring-asciidoctor-backends.version>
 		<spring-hateoas>1.5.4</spring-hateoas>
 		<spring-plugin>2.0.0.RELEASE</spring-plugin>
 		<testcontainers>1.17.6</testcontainers>
@@ -276,7 +277,8 @@
 												<exclude>org.springframework.data:*</exclude>
 											</excludes>
 										</requireReleaseDeps>
-										<NoSnapshotDependenciesInDependencyManagementRule implementation="de.smartics.maven.enforcer.rule.NoSnapshotsInDependencyManagementRule">
+										<NoSnapshotDependenciesInDependencyManagementRule
+												implementation="de.smartics.maven.enforcer.rule.NoSnapshotsInDependencyManagementRule">
 											<onlyWhenRelease>true</onlyWhenRelease>
 										</NoSnapshotDependenciesInDependencyManagementRule>
 									</rules>
@@ -333,8 +335,6 @@
 
 			<properties>
 				<shared.resources>${project.build.directory}/shared-resources</shared.resources>
-				<generated-asciidoc-sources.directory>${project.build.directory}/generated-asciidoc-sources/source/
-				</generated-asciidoc-sources.directory>
 				<generated-docs.directory>${project.build.directory}/generated-docs</generated-docs.directory>
 				<maven.test.skip>true</maven.test.skip>
 				<aspectj.skip>true</aspectj.skip>
@@ -343,13 +343,6 @@
 			</properties>
 
 			<dependencies>
-				<dependency>
-					<groupId>io.spring.docresources</groupId>
-					<artifactId>spring-doc-resources</artifactId>
-					<version>0.2.5</version>
-					<type>zip</type>
-					<optional>true</optional>
-				</dependency>
 				<dependency>
 					<groupId>org.springframework.data.build</groupId>
 					<artifactId>spring-data-build-resources</artifactId>
@@ -389,20 +382,6 @@
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-dependency-plugin</artifactId>
 						<executions>
-							<execution>
-								<id>unpack-doc-resources</id>
-								<goals>
-									<goal>unpack-dependencies</goal>
-								</goals>
-								<phase>generate-resources</phase>
-								<configuration>
-									<includeGroupIds>io.spring.docresources</includeGroupIds>
-									<includeArtifactIds>spring-doc-resources</includeArtifactIds>
-									<includeTypes>zip</includeTypes>
-									<excludeTransitive>true</excludeTransitive>
-									<outputDirectory>${generated-asciidoc-sources.directory}</outputDirectory>
-								</configuration>
-							</execution>
 							<execution>
 								<id>unpack-shared-resources</id>
 								<goals>
@@ -427,6 +406,10 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-javadoc-plugin</artifactId>
+						<configuration>
+							<javadocDirectory>${shared.resources}/javadoc</javadocDirectory>
+							<overview>${shared.resources}/javadoc/overview.html</overview>
+						</configuration>
 						<executions>
 							<execution>
 								<id>aggregate-javadoc</id>
@@ -463,31 +446,6 @@
 								</goals>
 							</execution>
 
-							<execution>
-								<id>create-generated-docs-resources</id>
-								<phase>process-resources</phase>
-								<configuration>
-									<target>
-										<copy failonerror="false" todir="${generated-asciidoc-sources.directory}/">
-											<fileset dir="${project.root}/src/main/asciidoc" includes="**/*.adoc"/>
-										</copy>
-										<copy failonerror="false" todir="${generated-asciidoc-sources.directory}/images/">
-											<fileset dir="${project.root}/src/main/asciidoc/images"/>
-										</copy>
-
-										<copy todir="${generated-docs.directory}">
-											<fileset dir="${generated-asciidoc-sources.directory}">
-												<include name="css/**"/>
-												<include name="js/**"/>
-											</fileset>
-										</copy>
-									</target>
-								</configuration>
-								<goals>
-									<goal>run</goal>
-								</goals>
-							</execution>
-
 							<execution>
 								<id>rename-reference-docs</id>
 								<phase>prepare-package</phase>
@@ -495,29 +453,16 @@
 									<target>
 
 										<!-- Copy files for the single-file HTML version -->
-										<copy failonerror="false" todir="${project.root}/target/site/reference/html/images">
-											<fileset dir="${generated-docs.directory}/images"/>
-										</copy>
-
-										<!-- Copy shared resources. Spring Data ones first to override the ones shared -->
-										<copy failonerror="false" todir="${project.root}/target/site/reference/html/">
-											<fileset dir="${shared.resources}">
+										<copy failonerror="false" todir="${project.root}/target/site/reference/html">
+											<fileset dir="${generated-docs.directory}">
+												<include name="img/**"/>
+												<include name="images/**"/>
 												<include name="css/**"/>
 												<include name="js/**"/>
+												<include name="**/*.html"/>
 											</fileset>
 										</copy>
 
-										<copy failonerror="false" todir="${project.root}/target/site/reference/html/">
-											<fileset dir="${generated-asciidoc-sources.directory}">
-												<include name="css/**"/>
-												<include name="js/**"/>
-											</fileset>
-										</copy>
-
-										<copy failonerror="false" todir="${project.root}/target/site/reference/html/">
-											<fileset dir="${generated-docs.directory}" includes="*.html"/>
-										</copy>
-
 										<!-- Copy and rename the Epub file -->
 										<copy failonerror="false" file="${generated-docs.directory}/index.pdf" tofile="${project.root}/target/site/reference/pdf/${dist.id}-reference.pdf"/>
 
@@ -561,9 +506,9 @@
 										<goal>process-asciidoc</goal>
 									</goals>
 									<configuration>
-										<sourceDirectory>${generated-asciidoc-sources.directory}</sourceDirectory>
+										<sourceDirectory>${project.root}/src/main/asciidoc</sourceDirectory>
 										<sourceDocumentName>index.adoc</sourceDocumentName>
-										<backend>html5</backend>
+										<backend>spring-html</backend>
 										<outputDirectory>${generated-docs.directory}</outputDirectory>
 										<attributes>
 											<source-highlighter>highlight.js</source-highlighter>
@@ -572,7 +517,7 @@
 											<linkcss>true</linkcss>
 											<sectanchors>true</sectanchors>
 											<stylesdir>./css</stylesdir>
-											<stylesheet>spring.css</stylesheet>
+											<stylesheet>site.css</stylesheet>
 											<toc>left</toc>
 										</attributes>
 									</configuration>
@@ -592,14 +537,16 @@
 									<projectVersion>${project.version}</projectVersion>
 									<aspectjVersion>${aspectj}</aspectjVersion>
 									<querydslVersion>${querydsl}</querydslVersion>
+									<springDocsUrl>https://docs.spring.io/spring-framework/docs/${spring}/reference/html/</springDocsUrl>
+									<springJavadocUrl>https://docs.spring.io/spring-framework/docs/${spring}/javadoc-api/</springJavadocUrl>
 									<springVersion>${spring}</springVersion>
+									<springHateoasVersion>${spring-hateoas}</springHateoasVersion>
 									<releasetrainVersion>${releasetrain}</releasetrainVersion>
 									<allow-uri-read>true</allow-uri-read>
 									<toclevels>4</toclevels>
 									<numbered>true</numbered>
 								</attributes>
 							</configuration>
-
 						</plugin>
 
 						<!--
@@ -1037,7 +984,24 @@
 				<plugin>
 					<groupId>org.asciidoctor</groupId>
 					<artifactId>asciidoctor-maven-plugin</artifactId>
-					<version>2.2.2</version>
+					<version>2.2.3</version>
+					<dependencies>
+						<dependency>
+							<groupId>org.jruby</groupId>
+							<artifactId>jruby</artifactId>
+							<version>9.3.7.0</version>
+						</dependency>
+						<dependency>
+							<groupId>org.asciidoctor</groupId>
+							<artifactId>asciidoctorj</artifactId>
+							<version>2.5.7</version>
+						</dependency>
+						<dependency>
+							<groupId>io.spring.asciidoctor.backends</groupId>
+							<artifactId>spring-asciidoctor-backends</artifactId>
+							<version>${spring-asciidoctor-backends.version}</version>
+						</dependency>
+					</dependencies>
 				</plugin>
 
 				<plugin>