diff --git a/bom/README.adoc b/bom/README.adoc
index b1486422..7e0f32eb 100644
--- a/bom/README.adoc
+++ b/bom/README.adoc
@@ -1,17 +1,17 @@
 = Spring Data - Release Train BOM example
 
-This project shows the usage of the Spring Data release train in a non-Spring-Boot project with both Maven and Gradle.
+This project shows the usage of the Spring Data BOM in a non-Spring-Boot project with both Maven and Gradle.
 
 == Properties
 
-In both Maven and Gradle a couple of properties are used to define the versions of Spring Framework and Spring Data to use. For Spring Framework a plain version is used. For Spring Data we refer to a particular revision of a release train. The naming of Spring Data releases uses the following conventions:
+In both Maven and Gradle a couple of properties are used to define the versions of Spring Framework and Spring Data to use. For Spring Framework a plain version is used. For Spring Data we refer to the https://spring.io/blog/2020/04/30/updates-to-spring-versions[calver revision] of the BOM. The naming of Spring Data releases uses the following conventions:
 
-** `${release-train}-M1` -> Milestones
+** `${calver-version}-M1` -> Milestones
 ** …
-** `${release-train}-RC1` -> Release candidate
+** `${calver-version}-RC1` -> Release candidate
 ** …
-** `${release-train}-RELEASE` -> GA version
-** `${release-train}-SR1` -> Services release (bugfixes) for that release train
+** `${calver-version}` -> GA version
+** `${calver-version}` -> Services release (bugfixes) for that release train
 
 == Maven
 
diff --git a/bom/build.gradle b/bom/build.gradle
index 3b66459a..eeef658f 100644
--- a/bom/build.gradle
+++ b/bom/build.gradle
@@ -8,14 +8,14 @@ repositories {
 }
 
 ext {
-	springVersion = '5.1.5.RELEASE'
-	springDataVersion = 'Lovelace-SR5'
+	springVersion = '5.3.9'
+	springDataVersion = '2021.0.4'
 }
 
 dependencyManagement {
 	imports {
 		mavenBom "org.springframework:spring-framework-bom:${springVersion}"
-		mavenBom "org.springframework.data:spring-data-releasetrain:${springDataVersion}"
+		mavenBom "org.springframework.data:spring-data-bom:${springDataVersion}"
 	}
 }
 
diff --git a/bom/pom.xml b/bom/pom.xml
index 80bfd2c4..d490c66f 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -9,8 +9,8 @@
 	<name>Spring Data - Using the BOM for dependency management</name>
 
 	<properties>
-		<spring.version>5.1.5.RELEASE</spring.version>
-		<spring-data.version>Lovelace-SR5</spring-data.version>
+		<spring.version>5.3.9</spring.version>
+		<spring-data.version>2021.0.4</spring-data.version>
 	</properties>
 
 	<dependencyManagement>
@@ -26,7 +26,7 @@
 
 			<dependency>
 				<groupId>org.springframework.data</groupId>
-				<artifactId>spring-data-releasetrain</artifactId>
+				<artifactId>spring-data-bom</artifactId>
 				<version>${spring-data.version}</version>
 				<scope>import</scope>
 				<type>pom</type>