diff --git a/src/main/antora/resources/antora-resources/antora.yml b/src/main/antora/resources/antora-resources/antora.yml
index 9ba685e37..2271bcf71 100644
--- a/src/main/antora/resources/antora-resources/antora.yml
+++ b/src/main/antora/resources/antora-resources/antora.yml
@@ -9,11 +9,12 @@ asciidoc:
     copyright-year: ${current.year}
     springversionshort: ${spring.short}
     springversion: ${spring}
-    spring-data-commons-javadoc-base: https://docs.spring.io/spring-data/data-commons/docs/{version}/api/
+    spring-data-commons-docs-url: https://docs.spring.io/spring-data/commons/reference/{version}
+    spring-data-commons-javadoc-base: https://docs.spring.io/spring-data/commons/reference/{version}/api/java
     springdocsurl: https://docs.spring.io/spring-framework/reference/{springversionshort}
     spring-framework-docs: '{springdocsurl}'
-    springjavadocurl: https://docs.spring.io/spring-framework/docs/{springversion}/javadoc-api
+    springjavadocurl: https://docs.spring.io/spring-framework/docs/${spring}/javadoc-api
     spring-framework-javadoc: '{springjavadocurl}'
+    springhateoasversion: ${spring-hateoas}
     releasetrainversion: ${releasetrain}
     store: Jpa
-    springhateoasversion: ${spring-hateoas}