diff --git a/spring-session-docs/modules/ROOT/pages/api.adoc b/spring-session-docs/modules/ROOT/pages/api.adoc
index c85a7e98..63e5261f 100644
--- a/spring-session-docs/modules/ROOT/pages/api.adoc
+++ b/spring-session-docs/modules/ROOT/pages/api.adoc
@@ -541,7 +541,7 @@ include::{indexdoc-tests}[tags=new-jdbcindexedsessionrepository]
 ----
 ====
 
-For additional information on how to create and configure `JdbcTemplate` and `PlatformTransactionManager`, see the https://docs.spring.io/spring/docs/{spring-framework-version}/spring-framework-reference/data-access.html[Spring Framework Reference Documentation].
+For additional information on how to create and configure `JdbcTemplate` and `PlatformTransactionManager`, see the https://docs.spring.io/spring/docs/{spring-core-version}/spring-framework-reference/data-access.html[Spring Framework Reference Documentation].
 
 [[api-jdbcindexedsessionrepository-config]]
 === Using `@EnableJdbcHttpSession`
diff --git a/spring-session-docs/modules/ROOT/pages/guides/java-hazelcast.adoc b/spring-session-docs/modules/ROOT/pages/guides/java-hazelcast.adoc
index d301dc9b..4970c4b2 100644
--- a/spring-session-docs/modules/ROOT/pages/guides/java-hazelcast.adoc
+++ b/spring-session-docs/modules/ROOT/pages/guides/java-hazelcast.adoc
@@ -33,7 +33,7 @@ If you use Maven, you must add the following dependencies:
 	<dependency>
 		<groupId>org.springframework</groupId>
 		<artifactId>spring-web</artifactId>
-		<version>{spring-framework-version}</version>
+		<version>{spring-core-version}</version>
 	</dependency>
 </dependencies>
 ----
diff --git a/spring-session-docs/modules/ROOT/pages/guides/java-jdbc.adoc b/spring-session-docs/modules/ROOT/pages/guides/java-jdbc.adoc
index c725de8f..98feb40b 100644
--- a/spring-session-docs/modules/ROOT/pages/guides/java-jdbc.adoc
+++ b/spring-session-docs/modules/ROOT/pages/guides/java-jdbc.adoc
@@ -33,7 +33,7 @@ If you use Maven, you must add the following dependencies:
 	<dependency>
 		<groupId>org.springframework</groupId>
 		<artifactId>spring-web</artifactId>
-		<version>{spring-framework-version}</version>
+		<version>{spring-core-version}</version>
 	</dependency>
 </dependencies>
 ----
@@ -100,7 +100,7 @@ We configure the H2 database to create database tables by using the SQL script t
 <3> We create a `transactionManager` that manages transactions for previously configured `dataSource`.
 ====
 
-For additional information on how to configure data access related concerns, see the https://docs.spring.io/spring/docs/{spring-framework-version}/spring-framework-reference/data-access.html[Spring Framework Reference Documentation].
+For additional information on how to configure data access related concerns, see the https://docs.spring.io/spring/docs/{spring-core-version}/spring-framework-reference/data-access.html[Spring Framework Reference Documentation].
 
 == Java Servlet Container Initialization
 
diff --git a/spring-session-docs/modules/ROOT/pages/guides/java-redis.adoc b/spring-session-docs/modules/ROOT/pages/guides/java-redis.adoc
index afaebdec..31b82d0b 100644
--- a/spring-session-docs/modules/ROOT/pages/guides/java-redis.adoc
+++ b/spring-session-docs/modules/ROOT/pages/guides/java-redis.adoc
@@ -33,12 +33,12 @@ If you are using Maven, you must add the following dependencies:
 	<dependency>
 		<groupId>io.lettuce</groupId>
 		<artifactId>lettuce-core</artifactId>
-		<version>{lettuce-version}</version>
+		<version>{lettuce-core-version}</version>
 	</dependency>
 	<dependency>
 		<groupId>org.springframework</groupId>
 		<artifactId>spring-web</artifactId>
-		<version>{spring-framework-version}</version>
+		<version>{spring-core-version}</version>
 	</dependency>
 </dependencies>
 ----
diff --git a/spring-session-docs/modules/ROOT/pages/guides/java-rest.adoc b/spring-session-docs/modules/ROOT/pages/guides/java-rest.adoc
index d8dcb6da..88ee5a88 100644
--- a/spring-session-docs/modules/ROOT/pages/guides/java-rest.adoc
+++ b/spring-session-docs/modules/ROOT/pages/guides/java-rest.adoc
@@ -33,12 +33,12 @@ If you use Maven, you must add the following dependencies:
 	<dependency>
 		<groupId>io.lettuce</groupId>
 		<artifactId>lettuce-core</artifactId>
-		<version>{lettuce-version}</version>
+		<version>{lettuce-core-version}</version>
 	</dependency>
 	<dependency>
 		<groupId>org.springframework</groupId>
 		<artifactId>spring-web</artifactId>
-		<version>{spring-framework-version}</version>
+		<version>{spring-core-version}</version>
 	</dependency>
 </dependencies>
 ----
diff --git a/spring-session-docs/modules/ROOT/pages/guides/java-security.adoc b/spring-session-docs/modules/ROOT/pages/guides/java-security.adoc
index f183c2b4..a4867f0b 100644
--- a/spring-session-docs/modules/ROOT/pages/guides/java-security.adoc
+++ b/spring-session-docs/modules/ROOT/pages/guides/java-security.adoc
@@ -33,12 +33,12 @@ If you use Maven, you must add the following dependencies:
 	<dependency>
 		<groupId>io.lettuce</groupId>
 		<artifactId>lettuce-core</artifactId>
-		<version>{lettuce-version}</version>
+		<version>{lettuce-core-version}</version>
 	</dependency>
 	<dependency>
 		<groupId>org.springframework</groupId>
 		<artifactId>spring-web</artifactId>
-		<version>{spring-framework-version}</version>
+		<version>{spring-core-version}</version>
 	</dependency>
 </dependencies>
 ----
diff --git a/spring-session-docs/modules/ROOT/pages/guides/xml-jdbc.adoc b/spring-session-docs/modules/ROOT/pages/guides/xml-jdbc.adoc
index ec084e25..531d74f9 100644
--- a/spring-session-docs/modules/ROOT/pages/guides/xml-jdbc.adoc
+++ b/spring-session-docs/modules/ROOT/pages/guides/xml-jdbc.adoc
@@ -33,7 +33,7 @@ If you are using Maven, you must add the following dependencies:
 	<dependency>
 		<groupId>org.springframework</groupId>
 		<artifactId>spring-web</artifactId>
-		<version>{spring-framework-version}</version>
+		<version>{spring-core-version}</version>
 	</dependency>
 </dependencies>
 ----
@@ -102,7 +102,7 @@ We configure the H2 database to create database tables by using the SQL script t
 <3> We create a `transactionManager` that manages transactions for previously configured `dataSource`.
 ====
 
-For additional information on how to configure data access-related concerns, see the https://docs.spring.io/spring/docs/{spring-framework-version}/spring-framework-reference/data-access.html[Spring Framework Reference Documentation].
+For additional information on how to configure data access-related concerns, see the https://docs.spring.io/spring/docs/{spring-core-version}/spring-framework-reference/data-access.html[Spring Framework Reference Documentation].
 
 == XML Servlet Container Initialization
 
@@ -121,7 +121,7 @@ include::{samples-dir}spring-session-sample-xml-jdbc/src/main/webapp/WEB-INF/web
 ----
 ====
 
-The https://docs.spring.io/spring/docs/{spring-framework-version}/spring-framework-reference/core.html#context-create[`ContextLoaderListener`] reads the `contextConfigLocation` and picks up our session.xml configuration.
+The https://docs.spring.io/spring/docs/{spring-core-version}/spring-framework-reference/core.html#context-create[`ContextLoaderListener`] reads the `contextConfigLocation` and picks up our session.xml configuration.
 
 Last, we need to ensure that our Servlet Container (that is, Tomcat) uses our `springSessionRepositoryFilter` for every request.
 The following snippet performs this last step for us:
@@ -134,7 +134,7 @@ include::{samples-dir}spring-session-sample-xml-jdbc/src/main/webapp/WEB-INF/web
 ----
 ====
 
-The https://docs.spring.io/spring-framework/docs/{spring-framework-version}/javadoc-api/org/springframework/web/filter/DelegatingFilterProxy.html[`DelegatingFilterProxy`] looks up a bean named `springSessionRepositoryFilter` and casts it to a `Filter`.
+The https://docs.spring.io/spring-framework/docs/{spring-core-version}/javadoc-api/org/springframework/web/filter/DelegatingFilterProxy.html[`DelegatingFilterProxy`] looks up a bean named `springSessionRepositoryFilter` and casts it to a `Filter`.
 For every request on which `DelegatingFilterProxy` is invoked, the `springSessionRepositoryFilter` is invoked.
 
 // end::config[]
diff --git a/spring-session-docs/modules/ROOT/pages/guides/xml-redis.adoc b/spring-session-docs/modules/ROOT/pages/guides/xml-redis.adoc
index 70592453..7b8595ff 100644
--- a/spring-session-docs/modules/ROOT/pages/guides/xml-redis.adoc
+++ b/spring-session-docs/modules/ROOT/pages/guides/xml-redis.adoc
@@ -32,12 +32,12 @@ If you use Maven, you must add the following dependencies:
 	<dependency>
 		<groupId>io.lettuce</groupId>
 		<artifactId>lettuce-core</artifactId>
-		<version>{lettuce-version}</version>
+		<version>{lettuce-core-version}</version>
 	</dependency>
 	<dependency>
 		<groupId>org.springframework</groupId>
 		<artifactId>spring-web</artifactId>
-		<version>{spring-framework-version}</version>
+		<version>{spring-core-version}</version>
 	</dependency>
 </dependencies>
 ----
@@ -122,7 +122,7 @@ include::{samples-dir}spring-session-sample-xml-redis/src/main/webapp/WEB-INF/we
 ----
 ====
 
-The https://docs.spring.io/spring/docs/{spring-framework-version}/spring-framework-reference/core.html#context-create[`ContextLoaderListener`] reads the contextConfigLocation and picks up our session.xml configuration.
+The https://docs.spring.io/spring/docs/{spring-core-version}/spring-framework-reference/core.html#context-create[`ContextLoaderListener`] reads the contextConfigLocation and picks up our session.xml configuration.
 
 Last, we need to ensure that our Servlet Container (that is, Tomcat) uses our `springSessionRepositoryFilter` for every request.
 The following snippet performs this last step for us:
@@ -135,7 +135,7 @@ include::{samples-dir}spring-session-sample-xml-redis/src/main/webapp/WEB-INF/we
 ----
 ====
 
-The https://docs.spring.io/spring-framework/docs/{spring-framework-version}/javadoc-api/org/springframework/web/filter/DelegatingFilterProxy.html[`DelegatingFilterProxy`] looks up a Bean by the name of `springSessionRepositoryFilter` and cast it to a `Filter`.
+The https://docs.spring.io/spring-framework/docs/{spring-core-version}/javadoc-api/org/springframework/web/filter/DelegatingFilterProxy.html[`DelegatingFilterProxy`] looks up a Bean by the name of `springSessionRepositoryFilter` and cast it to a `Filter`.
 For every request that `DelegatingFilterProxy` is invoked, the `springSessionRepositoryFilter` is invoked.
 
 // end::config[]
diff --git a/spring-session-docs/modules/ROOT/pages/spring-security.adoc b/spring-session-docs/modules/ROOT/pages/spring-security.adoc
index 64ee6c3b..ea45e49e 100644
--- a/spring-session-docs/modules/ROOT/pages/spring-security.adoc
+++ b/spring-session-docs/modules/ROOT/pages/spring-security.adoc
@@ -6,7 +6,7 @@ Spring Session provides integration with Spring Security.
 [[spring-security-rememberme]]
 == Spring Security Remember-me Support
 
-Spring Session provides integration with https://docs.spring.io/spring-security/site/docs/{spring-security-version}/reference/html5/#servlet-rememberme[Spring Security's Remember-me Authentication].
+Spring Session provides integration with https://docs.spring.io/spring-security/site/docs/{spring-security-core-version}/reference/html5/#servlet-rememberme[Spring Security's Remember-me Authentication].
 The support:
 
 * Changes the session expiration length
diff --git a/spring-session-docs/modules/ROOT/pages/web-session.adoc b/spring-session-docs/modules/ROOT/pages/web-session.adoc
index c33dc268..346747d9 100644
--- a/spring-session-docs/modules/ROOT/pages/web-session.adoc
+++ b/spring-session-docs/modules/ROOT/pages/web-session.adoc
@@ -113,4 +113,4 @@ public class SpringSessionWebSessionStore<S extends Session> implements WebSessi
 ====
 
 To be detected by Spring WebFlux, this custom `WebSessionStore` needs to be registered with `ApplicationContext` as a bean named `webSessionManager`.
-For additional information on Spring WebFlux, see the https://docs.spring.io/spring-framework/docs/{spring-framework-version}/reference/html/web-reactive.html[Spring Framework Reference Documentation].
+For additional information on Spring WebFlux, see the https://docs.spring.io/spring-framework/docs/{spring-core-version}/reference/html/web-reactive.html[Spring Framework Reference Documentation].