diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml
index fcc6ddf119..afb44d94da 100644
--- a/.github/workflows/deploy-docs.yml
+++ b/.github/workflows/deploy-docs.yml
@@ -36,7 +36,7 @@ jobs:
         echo BUILD_VERSION=$BUILD_VERSION >> $GITHUB_ENV
     - name: Run Antora
       run: |
-        ./mvnw compile
+        ./mvnw antora
     - name: Publish Docs
       uses: spring-io/spring-doc-actions/rsync-antora-reference@v0.0.11
       with:
@@ -44,7 +44,7 @@ jobs:
         docs-host: ${{ secrets.DOCS_HOST }}
         docs-ssh-key: ${{ secrets.DOCS_SSH_KEY }}
         docs-ssh-host-key: ${{ secrets.DOCS_SSH_HOST_KEY }}
-        site-path: target/site
+        site-path: spring-data-jpa/target/antora/site
     - name: Bust Cloudflare Cache
       uses: spring-io/spring-doc-actions/bust-cloudflare-antora-cache@v0.0.11
       with:
diff --git a/antora-playbook.yml b/antora-playbook.yml
index 69cee8e3cc..1ad35acafd 100644
--- a/antora-playbook.yml
+++ b/antora-playbook.yml
@@ -1,8 +1,10 @@
 antora:
   extensions:
   - '@springio/antora-extensions/partial-build-extension'
+  - require: '@springio/antora-extensions/latest-version-extension'
   - require: '@springio/antora-extensions/inject-collector-cache-config-extension'
   - '@antora/collector-extension'
+  - './antora/lib/version-fix.js'
   - '@antora/atlas-extension'
   - require: '@springio/antora-extensions/root-component-extension'
     root_component_name: 'data-jpa'
@@ -15,7 +17,14 @@ git:
 content:
   sources:
   - url: https://github.com/spring-projects/spring-data-jpa
-    branches: [main]
+    # Refname matching:
+    # https://docs.antora.org/antora/latest/playbook/content-refname-matching/
+    branches: [ main,'({3..9}).+({0..9}).x', '!(3.{0..1}.x)' ]
+    tags: [ '({3..9}).+({0..9}).+({0..9})?(-{RC,M}+({0..9}))', '!(3.{0..1}.+({0..9})?(-{RC,M}+({0..9})))','!(3.2.0-M1)','!(3.2.0-M2)' ]
+    start_path: spring-data-jpa/src/main/antora
+  - url: https://github.com/spring-projects/spring-data-jpa
+    branches: []
+    tags: [ '3.2.0-M2' ]
     start_path: src/main/antora
 asciidoc:
   attributes:
diff --git a/antora/lib/version-fix.js b/antora/lib/version-fix.js
new file mode 100644
index 0000000000..dc0858f812
--- /dev/null
+++ b/antora/lib/version-fix.js
@@ -0,0 +1,18 @@
+'use strict'
+
+/**
+ * The purpose of this extension is to fix invalid metadata saved to either antora.yml or gradle.properties in certain
+ * tags. This invalid metadata prevents Antora from classifying the component versions properly.
+ *
+ * This extension should be listed directly after @antora/collector-extension.
+ */
+ module.exports.register = function () {
+   this.once('contentAggregated', ({ contentAggregate }) => {
+       contentAggregate.forEach((componentVersionBucket) => {
+         if (componentVersionBucket.version === '3.2.0-SNAPSHOT') {
+           componentVersionBucket.version = '3.2.0'
+           componentVersionBucket.prerelease = '-SNAPSHOT'
+         }
+       })
+     })
+ }
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 2ccc534753..5de2018977 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,103 +27,30 @@
 		<scala>2.11.7</scala>
 		<xmlbeam>1.4.24</xmlbeam>
 		<java-module-name>spring.data.jpa</java-module-name>
-
-		<!-- Antora -->
-		<node.version>v18.12.1</node.version>
-		<npm.version>8.19.2</npm.version>
-		<antora.version>3.2.0-alpha.2</antora.version>
-		<antora-atlas.version>1.0.0-alpha.1</antora-atlas.version>
-		<antora-collector.version>1.0.0-alpha.3</antora-collector.version>
-		<asciidoctor-tabs.version>1.0.0-beta.3</asciidoctor-tabs.version>
-		<spring-antora-extensions.version>1.5.0</spring-antora-extensions.version>
-		<spring-asciidoctor-extensions.version>1.0.0-alpha.9</spring-asciidoctor-extensions.version>
-
+		<io.spring.maven.antora-version>0.0.3</io.spring.maven.antora-version>
 	</properties>
 
 
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>com.github.eirslett</groupId>
-				<artifactId>frontend-maven-plugin</artifactId>
-				<version>1.12.1</version>
-				<executions>
-					<execution>
-						<id>install node and npm</id>
-						<goals>
-							<goal>install-node-and-npm</goal>
-						</goals>
-						<phase>initialize</phase>
-						<configuration>
-							<nodeVersion>${node.version}</nodeVersion>
-							<npmVersion>${npm.version}</npmVersion>
-						</configuration>
-					</execution>
-					<execution>
-						<id>npm install antora</id>
-						<goals>
-							<goal>npm</goal>
-						</goals>
-						<phase>initialize</phase>
-						<configuration>
-							<arguments>install @antora/cli@${antora.version} @antora/site-generator-default@${antora.version} @antora/atlas-extension@${antora-atlas.version} @antora/collector-extension@${antora-collector.version} @asciidoctor/tabs@${asciidoctor-tabs.version} @springio/antora-extensions@${spring-antora-extensions.version} @springio/asciidoctor-extensions@${spring-asciidoctor-extensions.version}</arguments>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>exec-maven-plugin</artifactId>
-				<version>3.0.0</version>
-				<executions>
-					<execution>
-						<id>antora</id>
-						<goals>
-							<goal>exec</goal>
-						</goals>
-						<phase>compile</phase>
-						<configuration>
-							<environmentVariables>
-								<ALGOLIA_API_KEY>9d489079e5ec46dbb238909fee5c9c29</ALGOLIA_API_KEY>
-								<ALGOLIA_APP_ID>WB1FQYI187</ALGOLIA_APP_ID>
-								<ALGOLIA_INDEX_NAME>springdatajpa</ALGOLIA_INDEX_NAME>
-							</environmentVariables>
-							<!-- If we don't want to depend on default node installation path we can use a maven
-							 property aligned with frontend-maven-plugin's installDirectory configuration -->
-							<executable>node/node</executable>
-							<arguments>
-								<argument>node_modules/.bin/antora</argument>
-								<argument>antora-playbook.yml</argument>
-								<argument>--to-dir=target/site</argument>
-								<argument>--stacktrace</argument>
-							</arguments>
-							<workingDirectory>${project.basedir}</workingDirectory>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-clean-plugin</artifactId>
-				<version>3.1.0</version>
+				<groupId>io.spring.maven.antora</groupId>
+				<artifactId>antora-maven-plugin</artifactId>
+				<version>${io.spring.maven.antora-version}</version>
+				<extensions>true</extensions>
 				<configuration>
-					<filesets>
-						<fileset>
-							<directory>node</directory>
-							<followSymlinks>false</followSymlinks>
-						</fileset>
-						<fileset>
-							<directory>node_modules</directory>
-							<followSymlinks>false</followSymlinks>
-						</fileset>
-						<fileset>
-							<directory>build</directory>
-							<followSymlinks>false</followSymlinks>
-						</fileset>
-					</filesets>
+					<options>
+						<option>--to-dir=target/antora/site</option>
+						<option>--stacktrace</option>
+						<option>--fetch</option>
+					</options>
+					<environment>
+						<ALGOLIA_API_KEY>9d489079e5ec46dbb238909fee5c9c29</ALGOLIA_API_KEY>
+						<ALGOLIA_APP_ID>WB1FQYI187</ALGOLIA_APP_ID>
+						<ALGOLIA_INDEX_NAME>springdatajpa</ALGOLIA_INDEX_NAME>
+					</environment>
 				</configuration>
 			</plugin>
-
 		</plugins>
 	</build>