diff --git a/spring-graphql-docs/src/docs/asciidoc/attributes.adoc b/spring-graphql-docs/src/docs/asciidoc/attributes.adoc
index 81e2a8c2..82b5c502 100644
--- a/spring-graphql-docs/src/docs/asciidoc/attributes.adoc
+++ b/spring-graphql-docs/src/docs/asciidoc/attributes.adoc
@@ -22,5 +22,5 @@
 :graphql-java-docs: 			https://www.graphql-java.com/documentation
 :javadoc: 						https://docs.spring.io/spring-graphql/docs/{spring-graphql-version}/api
 // version attributes from main build.gradle
-:spring-framework-ref-docs: 	https://docs.spring.io/spring-framework/docs/{spring-framework-version}/reference/html
+:spring-framework-ref-docs: 	https://docs.spring.io/spring-framework/reference
 :spring-boot-ref-docs: 			https://docs.spring.io/spring-boot/docs/{spring-boot-version}/reference/html
\ No newline at end of file
diff --git a/spring-graphql-docs/src/docs/asciidoc/includes/client.adoc b/spring-graphql-docs/src/docs/asciidoc/includes/client.adoc
index 088f99c2..ce75335e 100644
--- a/spring-graphql-docs/src/docs/asciidoc/includes/client.adoc
+++ b/spring-graphql-docs/src/docs/asciidoc/includes/client.adoc
@@ -31,7 +31,7 @@ Once you have a `GraphQlClient` you can begin to make <<client.requests, request
 === HTTP
 
 `HttpGraphQlClient` uses
-{spring-framework-ref-docs}/web-reactive.html#webflux-client[WebClient] to execute
+{spring-framework-ref-docs}/web/webflux-webclient.html[WebClient] to execute
 GraphQL requests over HTTP.
 
 [source,java,indent=0,subs="verbatim,quotes"]
@@ -70,7 +70,7 @@ existing `HttpGraphQlClient` to create a new instance with customized settings:
 
 `WebSocketGraphQlClient` executes GraphQL requests over a shared WebSocket connection.
 It is built using the
-{spring-framework-ref-docs}/web-reactive.html#webflux-websocket-client[WebSocketClient]
+{spring-framework-ref-docs}/web/webflux-websocket.html#webflux-websocket-client[WebSocketClient]
 from Spring WebFlux and you can create it as follows:
 
 [source,java,indent=0,subs="verbatim,quotes"]
@@ -159,7 +159,7 @@ can be at most one interceptor of type `WebSocketGraphQlClientInterceptor`.
 === RSocket
 
 `RSocketGraphQlClient` uses
-{spring-framework-ref-docs}/web-reactive.html#rsocket-requester[RSocketRequester]
+{spring-framework-ref-docs}/rsocket.html#rsocket-requester[RSocketRequester]
 to execute GraphQL requests over RSocket requests.
 
 [source,java,indent=0,subs="verbatim,quotes"]
diff --git a/spring-graphql-docs/src/docs/asciidoc/includes/controllers.adoc b/spring-graphql-docs/src/docs/asciidoc/includes/controllers.adoc
index 47f7b93a..4f7d5be3 100644
--- a/spring-graphql-docs/src/docs/asciidoc/includes/controllers.adoc
+++ b/spring-graphql-docs/src/docs/asciidoc/includes/controllers.adoc
@@ -507,7 +507,7 @@ delegates to a `DataLoader`, you can reduce boilerplate by using a
 === Validation
 
 When a `javax.validation.Validator` bean is found, `AnnotatedControllerConfigurer` enables support for
-{spring-framework-ref-docs}/core.html#validation-beanvalidation-overview[Bean Validation]
+{spring-framework-ref-docs}/core/validation/beanvalidation.html#validation-beanvalidation-overview[Bean Validation]
 on annotated controller methods. Typically, the bean is of type `LocalValidatorFactoryBean`.
 
 Bean validation lets you declare constraints on types:
diff --git a/spring-graphql-docs/src/docs/asciidoc/includes/data.adoc b/spring-graphql-docs/src/docs/asciidoc/includes/data.adoc
index 44bac43f..7fe1bbb8 100644
--- a/spring-graphql-docs/src/docs/asciidoc/includes/data.adoc
+++ b/spring-graphql-docs/src/docs/asciidoc/includes/data.adoc
@@ -377,7 +377,7 @@ are helpful if you cannot partially materialize the aggregate object, but you st
 want to expose a subset of properties.
 - https://docs.spring.io/spring-data/commons/docs/current/reference/html/#projections.interfaces.open[Open interface projections]
 leverage Spring's `@Value` annotation and
-{spring-framework-ref-docs}/core.html#expressions[SpEL]  expressions to apply lightweight
+{spring-framework-ref-docs}/core/expressions.html[SpEL]  expressions to apply lightweight
 data transformations, such as concatenations, computations, or applying static functions
 to a property.
 
diff --git a/spring-graphql-docs/src/docs/asciidoc/includes/graalvm-native.adoc b/spring-graphql-docs/src/docs/asciidoc/includes/graalvm-native.adoc
index 794fac79..b616b7a5 100644
--- a/spring-graphql-docs/src/docs/asciidoc/includes/graalvm-native.adoc
+++ b/spring-graphql-docs/src/docs/asciidoc/includes/graalvm-native.adoc
@@ -29,7 +29,7 @@ This doesn't cover our third item in the list, as those types are provided by th
 == Native Server applications support
 
 In typical Spring for GraphQL applications, Java types tied to the GraphQL schema are exposed in `@Controller` method signatures
-as parameters or return types. During the {spring-framework-ref-docs}/core.html#core.aot[Ahead Of Time processing phase] of the build,
+as parameters or return types. During the {spring-framework-ref-docs}/core/aot.html[Ahead Of Time processing phase] of the build,
 Spring or GraphQL will use its `o.s.g.data.method.annotation.support.SchemaMappingBeanFactoryInitializationAotProcessor` to discover
 the relevant types and register reachability metadata accordingly.
 This is all done automatically for you if you are building a Spring Boot application with GraalVM support.
diff --git a/spring-graphql-docs/src/docs/asciidoc/includes/observability.adoc b/spring-graphql-docs/src/docs/asciidoc/includes/observability.adoc
index 09a0c625..b3582788 100644
--- a/spring-graphql-docs/src/docs/asciidoc/includes/observability.adoc
+++ b/spring-graphql-docs/src/docs/asciidoc/includes/observability.adoc
@@ -3,11 +3,11 @@
 
 https://micrometer.io/docs/observation[Observability support with Micrometer] is directly instrumented in Spring for GraphQL.
 This enables both metrics and traces for GraphQL requests and "non-trivial" data fetching operations.
-Because the GraphQL engine operates on top of a transport layer, you should also {spring-framework-ref-docs}/integration.html#integration.observability[expect observations from the transport], if supported in Spring Framework.
+Because the GraphQL engine operates on top of a transport layer, you should also {spring-framework-ref-docs}/integration/observability.html[expect observations from the transport], if supported in Spring Framework.
 
 Observations are only published if an `ObservationRegistry` is configured in the application.
 You can learn more about {spring-boot-ref-docs}/actuator.html#actuator.metrics[configuring the observability infrastructure in Spring Boot].
-If you would like to customize the metadata produced with the GraphQL observations, you can {spring-framework-ref-docs}/integration.html#integration.observability.config.conventions[configure a custom convention on the instrumentation directly].
+If you would like to customize the metadata produced with the GraphQL observations, you can {spring-framework-ref-docs}/integration/observability.html#observability.config.conventions[configure a custom convention on the instrumentation directly].
 If your application is using Spring Boot, contributing the custom convention as a bean is the preferred way.
 
 [[observability.server.request]]
@@ -16,7 +16,7 @@ If your application is using Spring Boot, contributing the custom convention as
 GraphQL Server Requests observations are created with the name `"graphql.request"` for traditional and Reactive applications and above all supported transports.
 This instrumentation assumes that any parent observation must be set as the current one on the GraphQL context with the well-known `"micrometer.observation"` key.
 For trace propagation across network boundaries, a separate instrumentation at the transport level must be in charge.
-In the case of HTTP, Spring Framework {spring-framework-ref-docs}/integration.html#integration.observability.http-server[has dedicated instrumentation that takes care of trace propagation].
+In the case of HTTP, Spring Framework {spring-framework-ref-docs}/integration/observability.html#observability.http-server[has dedicated instrumentation that takes care of trace propagation].
 
 Applications need to configure the `org.springframework.graphql.observation.GraphQlObservationInstrumentation` instrumentation in their application.
 It is using the `org.springframework.graphql.observation.DefaultExecutionRequestObservationConvention` by default, backed by the `ExecutionRequestObservationContext`.
diff --git a/spring-graphql-docs/src/docs/asciidoc/includes/testing.adoc b/spring-graphql-docs/src/docs/asciidoc/includes/testing.adoc
index 3d0c7d5c..949a4489 100644
--- a/spring-graphql-docs/src/docs/asciidoc/includes/testing.adoc
+++ b/spring-graphql-docs/src/docs/asciidoc/includes/testing.adoc
@@ -61,7 +61,7 @@ options relevant to all extensions.
 === HTTP
 
 `HttpGraphQlTester` uses
-{spring-framework-ref-docs}/testing.html#webtestclient[WebTestClient] to execute
+{spring-framework-ref-docs}/testing/webtestclient.html[WebTestClient] to execute
 GraphQL requests over HTTP, with or without a live server, depending on how
 `WebTestClient` is configured.
 
@@ -136,7 +136,7 @@ existing `HttpSocketGraphQlTester` to create a new instance with customized sett
 
 `WebSocketGraphQlTester` executes GraphQL requests over a shared WebSocket connection.
 It is built using the
-{spring-framework-ref-docs}/web-reactive.html#webflux-websocket-client[WebSocketClient]
+{spring-framework-ref-docs}/web/webflux-websocket.html#webflux-websocket-client[WebSocketClient]
 from Spring WebFlux and you can create it as follows:
 
 [source,java,indent=0,subs="verbatim,quotes"]