diff --git a/readme.adoc b/readme.adoc
index 0f6448d..78da04e 100644
--- a/readme.adoc
+++ b/readme.adoc
@@ -146,7 +146,7 @@ Both are available in the Spring/Pivotal Last Pass repository.
 2+| *Post-release tasks*
 |Close JIRA tickets and GitHub release tickets. |`$ tracker close $trainIteration`
 |Create new release versions and tickets for upcoming version |`$ tracker setup-next $trainIteration.next`
-|Trigger Antora documentation build (once all artifacts have arrived at the final Maven repository) |`$ github trigger documentation $trainIteration`
+|Trigger Antora documentation build (once all artifacts have arrived at the final Maven repository) |`$ release documentation $trainIteration`
 |Update versions in Projects Service. `$releaseTrains` is given as comma separated lists of code names, without spaces. E.g. `Moore,Neumann` |`$ projects update $releaseTrains`
 |Create list of docs for release announcements |`$ announcement $trainIteration`
 |===
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 572576d..b4d36f2 100644
--- a/src/main/java/org/springframework/data/release/build/UpdateInformation.java
+++ b/src/main/java/org/springframework/data/release/build/UpdateInformation.java
@@ -26,6 +26,7 @@ import java.util.Collections;
 import java.util.List;
 
 import org.springframework.data.release.model.ArtifactVersion;
+import org.springframework.data.release.model.Iteration;
 import org.springframework.data.release.model.Phase;
 import org.springframework.data.release.model.Project;
 import org.springframework.data.release.model.TrainIteration;
@@ -91,7 +92,8 @@ public class UpdateInformation {
 
 		if (phase == Phase.PREPARE) {
 
-			if (train.getIteration().isMilestone()) {
+			Iteration iteration = train.getIteration();
+			if (iteration.isMilestone() || iteration.isReleaseCandidate()) {
 				return Collections.singletonList(Repository.MILESTONE);
 			}
 		}
diff --git a/src/main/java/org/springframework/data/release/cli/ReleaseCommands.java b/src/main/java/org/springframework/data/release/cli/ReleaseCommands.java
index b3e98f2..09c0be4 100644
--- a/src/main/java/org/springframework/data/release/cli/ReleaseCommands.java
+++ b/src/main/java/org/springframework/data/release/cli/ReleaseCommands.java
@@ -22,6 +22,10 @@ import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import lombok.experimental.FieldDefaults;
 
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
 import org.springframework.data.release.CliComponent;
 import org.springframework.data.release.TimedCommand;
 import org.springframework.data.release.build.BuildOperations;
@@ -219,6 +223,28 @@ class ReleaseCommands extends TimedCommand {
 		}
 	}
 
+	@CliCommand(value = "release documentation")
+	public void triggerDocumentation(@CliOption(key = "", mandatory = true) TrainIteration iteration,
+			@CliOption(key = "module", mandatory = false) String module) {
+
+		Set<Project> skip = new HashSet<>(Arrays.asList(Projects.BOM, Projects.BUILD, Projects.R2DBC, Projects.JDBC,
+				Projects.SOLR, Projects.GEODE, Projects.SMOKE_TESTS));
+
+		iteration.forEach(it -> {
+
+			Project project = it.getProject();
+
+			if (skip.contains(project)) {
+				return;
+			}
+
+			if (module == null || module.equalsIgnoreCase(project.getName())) {
+				gitHub.triggerAntoraWorkflow(project);
+			}
+		});
+
+	}
+
 	private void setupMaintenanceVersions(TrainIteration iteration) throws Exception {
 
 		// Set project version to maintenance once
diff --git a/src/main/java/org/springframework/data/release/issues/github/GitHubCommands.java b/src/main/java/org/springframework/data/release/issues/github/GitHubCommands.java
index 9656cd1..0a42f05 100644
--- a/src/main/java/org/springframework/data/release/issues/github/GitHubCommands.java
+++ b/src/main/java/org/springframework/data/release/issues/github/GitHubCommands.java
@@ -20,10 +20,7 @@ import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import lombok.experimental.FieldDefaults;
 
-import java.util.Arrays;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 import java.util.concurrent.Executor;
 import java.util.stream.Collectors;
 
@@ -34,7 +31,6 @@ import org.springframework.data.release.issues.IssueTracker;
 import org.springframework.data.release.issues.TicketReference;
 import org.springframework.data.release.model.Iteration;
 import org.springframework.data.release.model.Project;
-import org.springframework.data.release.model.Projects;
 import org.springframework.data.release.model.Tracker;
 import org.springframework.data.release.model.TrainIteration;
 import org.springframework.data.release.utils.ExecutionUtils;
@@ -94,26 +90,7 @@ public class GitHubCommands extends TimedCommand {
 		});
 	}
 
-	@CliCommand(value = "github trigger documentation")
-	public void triggerDocumentation(@CliOption(key = "", mandatory = true) TrainIteration iteration,
-			@CliOption(key = "module", mandatory = false) String module) {
-
-		Set<Project> skip = new HashSet<>(Arrays.asList(Projects.BOM, Projects.BUILD, Projects.R2DBC, Projects.JDBC,
-				Projects.SOLR, Projects.GEODE, Projects.SMOKE_TESTS));
-
-		iteration.forEach(it -> {
-
-			Project project = it.getProject();
-
-			if (skip.contains(project)) {
-				return;
-			}
-
-			if (module == null || module.equalsIgnoreCase(project.getName())) {
-				gitHub.triggerAntoraWorkflow(project);
-			}
-		});
-
+	public void triggerAntoraWorkflow(Project project) {
+		gitHub.triggerAntoraWorkflow(project);
 	}
-
 }