diff --git a/release-tools/readme.md b/release-tools/readme.md
index 6ba2fb4..9808040 100644
--- a/release-tools/readme.md
+++ b/release-tools/readme.md
@@ -53,8 +53,6 @@ $ release prepare $trainIteration
 $ release build $trainIteration
 $ release conclude $trainIteration
 $ github push $trainIteration
-# After GitHub issues migration:
-# github push $trainIteration
 $ git backport changelog $trainIteration --target $targets
 $ foreach $target -> git push $target
 ```
@@ -74,7 +72,6 @@ $ release distribute $trainIteration
 $ tracker close $trainIteration
 $ tracker create releaseversions $trainIteration.next
 $ tracker create releasetickets $trainIteration.next
-$ tracker archive $trainIteration.previous
 ```
 
 * Update versions in Sagan with `$ sagan update $releasetrains`.
diff --git a/release-tools/src/main/java/org/springframework/data/release/cli/TrainIterationConverter.java b/release-tools/src/main/java/org/springframework/data/release/cli/TrainIterationConverter.java
index 15706e8..9d493b7 100644
--- a/release-tools/src/main/java/org/springframework/data/release/cli/TrainIterationConverter.java
+++ b/release-tools/src/main/java/org/springframework/data/release/cli/TrainIterationConverter.java
@@ -35,7 +35,7 @@ import org.springframework.stereotype.Component;
 @Component
 public class TrainIterationConverter implements Converter<TrainIteration> {
 
-	private static final Pattern CALVER = Pattern.compile("(\\d{4})(\\.(\\d))+(-M(\\d)|-RC(\\d))?");
+	private static final Pattern CALVER = Pattern.compile("(\\d{4})(\\.(\\d+))+(-M(\\d)|-RC(\\d))?");
 
 	/*
 	 * (non-Javadoc)
diff --git a/release-tools/src/main/java/org/springframework/data/release/model/ReleaseTrains.java b/release-tools/src/main/java/org/springframework/data/release/model/ReleaseTrains.java
index 0c09414..96fdd0e 100644
--- a/release-tools/src/main/java/org/springframework/data/release/model/ReleaseTrains.java
+++ b/release-tools/src/main/java/org/springframework/data/release/model/ReleaseTrains.java
@@ -68,14 +68,14 @@ public class ReleaseTrains {
 		OCKHAM = NEUMANN.next("Ockham", Transition.MINOR, //
 				new Module(BOM, "2020.0.0"), //
 				new Module(NEO4J, "6.0") //
-		).withCalver("2020.0");
+		).withIterations(Train.Iterations.DEFAULT).withCalver("2020.0");
 
 		PASCAL = OCKHAM.next("Pascal", Transition.MINOR) //
 				.filterModules(module -> !module.getProject().equals(SOLR))
 				.withCalver("2021.0") //
 				.withIterations(new Train.Iterations(M1, M2, M3, M4, M5, RC1, RC2, GA, SR1, SR2, SR3, SR4, SR5));
 
-		Q = PASCAL.next("R", Transition.MINOR) //
+		Q = PASCAL.next("Q", Transition.MINOR) //
 				.withCalver("2021.1") //
 				.withIterations(new Train.Iterations(M1, M2, M3, M4, M5, RC1, RC2, GA, SR1, SR2, SR3, SR4, SR5));