diff --git a/release-tools/src/main/java/org/springframework/data/release/build/BuildOperations.java b/release-tools/src/main/java/org/springframework/data/release/build/BuildOperations.java
index bf2048c..075bc1c 100644
--- a/release-tools/src/main/java/org/springframework/data/release/build/BuildOperations.java
+++ b/release-tools/src/main/java/org/springframework/data/release/build/BuildOperations.java
@@ -90,8 +90,6 @@ public class BuildOperations {
 	 * @return
 	 */
 	public DeploymentInformation performRelease(ModuleIteration module) {
-
-		prepareVersion(module, Phase.PREPARE);
 		return buildAndDeployRelease(module);
 	}
 
diff --git a/release-tools/src/main/java/org/springframework/data/release/cli/ReleaseCommands.java b/release-tools/src/main/java/org/springframework/data/release/cli/ReleaseCommands.java
index 7fdf91d..55c2715 100644
--- a/release-tools/src/main/java/org/springframework/data/release/cli/ReleaseCommands.java
+++ b/release-tools/src/main/java/org/springframework/data/release/cli/ReleaseCommands.java
@@ -82,10 +82,11 @@ public class ReleaseCommands implements CommandMarker {
 
 		misc.prepareChangelogs(iteration);
 		misc.updateResources(iteration);
-
 		build.updateProjectDescriptors(iteration, Phase.PREPARE);
-
 		git.commit(iteration, "Prepare %s.");
+
+		build.prepareVersions(iteration, Phase.PREPARE);
+		git.commit(iteration, "Release version %s.");
 	}
 
 	@CliCommand(value = "release build")
@@ -105,7 +106,7 @@ public class ReleaseCommands implements CommandMarker {
 			deployment.verifyAuthentication();
 
 			List<DeploymentInformation> deploymentInformation = build.performRelease(iteration);
-			git.commit(iteration, "Release version %s.");
+
 			deploymentInformation.forEach(deployment::promote);
 
 			build.prepareVersions(iteration, Phase.CLEANUP);