diff --git a/settings.gradle b/settings.gradle
index 28cf8adf..8101b7b6 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -12,6 +12,7 @@ plugins {
 
 rootProject.name = 'spring-session-build'
 
+include 'spring-session-bom'
 include 'spring-session-core'
 include 'spring-session-data-mongodb'
 include 'spring-session-data-redis'
diff --git a/spring-session-bom/spring-session-bom.gradle b/spring-session-bom/spring-session-bom.gradle
new file mode 100644
index 00000000..4271bc91
--- /dev/null
+++ b/spring-session-bom/spring-session-bom.gradle
@@ -0,0 +1,15 @@
+import io.spring.gradle.convention.SpringModulePlugin
+
+plugins {
+	id("io.spring.convention.bom")
+}
+
+dependencies {
+	constraints {
+		project.rootProject.allprojects { project ->
+			project.plugins.withType(SpringModulePlugin) {
+				api(project)
+			}
+		}
+	}
+}
diff --git a/spring-session-docs/modules/ROOT/nav.adoc b/spring-session-docs/modules/ROOT/nav.adoc
index 68e0daa6..10a06505 100644
--- a/spring-session-docs/modules/ROOT/nav.adoc
+++ b/spring-session-docs/modules/ROOT/nav.adoc
@@ -15,7 +15,6 @@
 *** xref:guides/boot-webflux-custom-cookie.adoc[Custom Cookie]
 ** Java Configuration
 ** XML Configuration
-* xref:modules.adoc[Modules]
 * xref:http-session.adoc[HttpSession Integration]
 * xref:web-socket.adoc[WebSocket Integration]
 * xref:web-session.adoc[WebSession Integration]
diff --git a/spring-session-docs/modules/ROOT/pages/modules.adoc b/spring-session-docs/modules/ROOT/pages/modules.adoc
deleted file mode 100644
index 24effcd8..00000000
--- a/spring-session-docs/modules/ROOT/pages/modules.adoc
+++ /dev/null
@@ -1,22 +0,0 @@
-[[modules]]
-= Spring Session Modules
-
-In Spring Session 1.x, all of the Spring Session's `SessionRepository` implementations were available within the `spring-session` artifact.
-While convenient, this approach was not sustainable long-term as more features and `SessionRepository` implementations were added to the project.
-
-With Spring Session 2.0, several modules were split off to be separate modules as well as managed repositories.
-Spring Session for MongoDB was retired, but was later reactivated as a separate module.
-As of Spring Session 2.6, Spring Session for MongoDB was merged back into Spring Session.
-
-Now the situation with the various repositories and modules is as follows:
-
-* https://github.com/spring-projects/spring-session[`spring-session` repository]
-** Hosts the Spring Session Core, Spring Session for MongoDB, Spring Session for Redis, Spring Session JDBC, and Spring Session Hazelcast modules.
-
-* https://github.com/spring-projects/spring-session-data-geode[`spring-session-data-geode` repository]
-** Hosts the Spring Session Data Geode modules. Spring Session Data Geode has its own user guide, which you can find at the [https://spring.io/projects/spring-session-data-geode#learn site].
-
-Finally, Spring Session also provides a Maven BOM ("`bill of materials`") module in order to help users with version management concerns:
-
-* https://github.com/spring-projects/spring-session-bom[`spring-session-bom` repository]
-** Hosts the Spring Session BOM module
diff --git a/spring-session-docs/modules/ROOT/pages/whats-new.adoc b/spring-session-docs/modules/ROOT/pages/whats-new.adoc
index b80da238..1d431e34 100644
--- a/spring-session-docs/modules/ROOT/pages/whats-new.adoc
+++ b/spring-session-docs/modules/ROOT/pages/whats-new.adoc
@@ -1,4 +1 @@
 = What's New
-
-Check also the Spring Session BOM https://github.com/spring-projects/spring-session-bom/wiki#release-notes[release notes]
-for a list of new and noteworthy features, as well as upgrade instructions for each release.