diff --git a/pom.xml b/pom.xml
index d95bc45fcc..39faac394e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,9 +99,11 @@
 										<propertyregex property="version-type" override="true"
 											input="${version-type}" regexp=".*\.(.*)" replace="\1" />
 										<propertyregex property="version-type" override="true"
-											input="${version-type}" regexp="(M)\d+" replace="\1ILESTONE" />
+											input="${version-type}" regexp="(M)\d+" replace="MILESTONE" />
 										<propertyregex property="version-type" override="true"
-											input="${version-type}" regexp="BUILD-(.*)" replace="\1" />
+											input="${version-type}" regexp="(RC)\d+" replace="MILESTONE" />
+										<propertyregex property="version-type" override="true"
+											input="${version-type}" regexp="BUILD-(.*)" replace="SNAPSHOT" />
 										<stringutil string="${version-type}" property="profile">
 											<lowercase />
 										</stringutil>
diff --git a/spring-boot-cli/pom.xml b/spring-boot-cli/pom.xml
index 18733fa406..4e947595d4 100644
--- a/spring-boot-cli/pom.xml
+++ b/spring-boot-cli/pom.xml
@@ -301,9 +301,11 @@
 								<propertyregex property="version-type" override="true"
 									input="${version-type}" regexp=".*\.(.*)" replace="\1" />
 								<propertyregex property="version-type" override="true"
-									input="${version-type}" regexp="(M)\d+" replace="\1ILESTONE" />
+									input="${version-type}" regexp="(M)\d+" replace="MILESTONE" />
 								<propertyregex property="version-type" override="true"
-									input="${version-type}" regexp="BUILD-(.*)" replace="\1" />
+									input="${version-type}" regexp="(RC)\d+" replace="MILESTONE" />
+								<propertyregex property="version-type" override="true"
+									input="${version-type}" regexp="BUILD-(.*)" replace="SNAPSHOT" />
 								<stringutil string="${version-type}" property="repo">
 									<lowercase />
 								</stringutil>