diff --git a/src/main/java/org/springframework/data/release/build/UpdateInformation.java b/src/main/java/org/springframework/data/release/build/UpdateInformation.java
index 4ba5697..572576d 100644
--- a/src/main/java/org/springframework/data/release/build/UpdateInformation.java
+++ b/src/main/java/org/springframework/data/release/build/UpdateInformation.java
@@ -96,7 +96,7 @@ public class UpdateInformation {
 			}
 		}
 
-		if (phase == Phase.CLEANUP) {
+		if (phase == Phase.CLEANUP || phase == Phase.MAINTENANCE) {
 			return Arrays.asList(Repository.SNAPSHOT, Repository.MILESTONE);
 		}
 
diff --git a/src/main/java/org/springframework/data/release/model/ReleaseTrains.java b/src/main/java/org/springframework/data/release/model/ReleaseTrains.java
index 4e60f1c..837b060 100644
--- a/src/main/java/org/springframework/data/release/model/ReleaseTrains.java
+++ b/src/main/java/org/springframework/data/release/model/ReleaseTrains.java
@@ -68,8 +68,7 @@ public class ReleaseTrains {
 				.withCalver("2021.1");
 
 		RAJ = Q.next("Raj", Transition.MINOR) //
-				.withCalver("2021.2") //
-				.withAlwaysUseBranch(true);
+				.withCalver("2021.2");
 
 		TURING = PASCAL.next("Turing", Transition.MAJOR, //
 				new Module(RELATIONAL, "3.0")) //