diff --git a/cffu-kotlin/pom.xml b/cffu-kotlin/pom.xml
index 9e5287ff..b878d61d 100644
--- a/cffu-kotlin/pom.xml
+++ b/cffu-kotlin/pom.xml
@@ -9,9 +9,7 @@
 	</parent>
 
 	<artifactId>cffu-kotlin</artifactId>
-	<!-- UPDATE to Alpha version WHEN RELEASE
-	<version>1.x.y-Alpha</version>
-	-->
+	<!-- UPDATE to Alpha version WHEN RELEASE, e.g. <version>1.x.y-Alpha</version> -->
 	<name>${project.artifactId}</name>
 	<description>Cffu Kotlin Support</description>
 	<url>https://github.com/foldright/cffu</url>
@@ -58,7 +56,7 @@
 	</developers>
 
 	<properties>
-		<release.pom.version.regex>^\d\.\d+\.\d+-Alpha$</release.pom.version.regex>
+		<maven.enforcer.pom.version.regex>${alpha.release.pom.version.regex}</maven.enforcer.pom.version.regex>
 
 		<maven.javadoc.skip>true</maven.javadoc.skip>
 		<dokka.version>2.0.0</dokka.version>
diff --git a/cffu-listenable-future/pom.xml b/cffu-listenable-future/pom.xml
index de6a676a..7bfb01ca 100644
--- a/cffu-listenable-future/pom.xml
+++ b/cffu-listenable-future/pom.xml
@@ -9,9 +9,7 @@
 	</parent>
 
 	<artifactId>cffu-listenable-future</artifactId>
-	<!-- UPDATE to Alpha version WHEN RELEASE
-	<version>1.x.y-Alpha</version>
-	-->
+	<!-- UPDATE to Alpha version WHEN RELEASE, e.g. <version>1.x.y-Alpha</version> -->
 	<name>Guava ListenableFuture Integration with CF</name>
 	<description>${project.name}</description>
 	<url>https://github.com/foldright/cffu</url>
@@ -70,7 +68,7 @@
 	</developers>
 
 	<properties>
-		<release.pom.version.regex>^\d\.\d+\.\d+-Alpha$</release.pom.version.regex>
+		<maven.enforcer.pom.version.regex>${alpha.release.pom.version.regex}</maven.enforcer.pom.version.regex>
 	</properties>
 
 	<dependencies>
diff --git a/demos/cffu-kotlin-demo/pom.xml b/demos/cffu-kotlin-demo/pom.xml
index 5c84edcf..20605f7a 100644
--- a/demos/cffu-kotlin-demo/pom.xml
+++ b/demos/cffu-kotlin-demo/pom.xml
@@ -19,8 +19,7 @@
 		<dependency>
 			<groupId>io.foldright</groupId>
 			<artifactId>cffu-kotlin</artifactId>
-			<!-- UPDATE to Alpha version WHEN RELEASE -->
-			<version>${project.version}</version>
+			<!-- UPDATE to Alpha version WHEN RELEASE, e.g. <version>1.x.y-Alpha</version> -->
 		</dependency>
 		<dependency>
 			<groupId>org.jetbrains.kotlin</groupId>
diff --git a/demos/pom.xml b/demos/pom.xml
index fc411f31..0b35822d 100644
--- a/demos/pom.xml
+++ b/demos/pom.xml
@@ -61,6 +61,11 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
+			<dependency>
+				<groupId>io.foldright</groupId>
+				<artifactId>cffu-kotlin</artifactId>
+				<version>${project.version}</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 	<build>
diff --git a/pom.xml b/pom.xml
index cf3a0c30..8124dc55 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,11 +68,14 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding>
 		<maven.deploy.skip>false</maven.deploy.skip>
-		<maven.enforcer.pom.version.regex>^\d(\.\d+)?\.(\d+|x)-SNAPSHOT$</maven.enforcer.pom.version.regex>
-		<release.pom.version.regex>^\d\.\d+\.\d+(-(Alpha|Beta|RC)\d+)?$</release.pom.version.regex>
 		<dokka.skip>false</dokka.skip>
 		<!-- dummy default value, overridden by profile -->
 		<main.run.debug.java.opt>-ea</main.run.debug.java.opt>
+		<!-- pom version regex pattern -->
+		<ga.release.pom.version.regex>^\d\.\d+\.\d+(-(Alpha|Beta|RC)\d+)?$</ga.release.pom.version.regex>
+		<alpha.release.pom.version.regex>^\d\.\d+\.\d+-Alpha\d*$</alpha.release.pom.version.regex>
+		<snapshot.pom.version.regex>^(\d\.\d+\.\d+|\d\.x)-SNAPSHOT$</snapshot.pom.version.regex>
+		<maven.enforcer.pom.version.regex>${snapshot.pom.version.regex}</maven.enforcer.pom.version.regex>
 
 		<spotbugs.annotations.version>4.8.6</spotbugs.annotations.version>
 		<jsr305.version>3.0.2</jsr305.version>
@@ -322,7 +325,9 @@
 								<requireProperty>
 									<property>project.version</property>
 									<regex>${maven.enforcer.pom.version.regex}</regex>
-									<regexMessage>Project version(${project.version}) format is invalid! regex: ${maven.enforcer.pom.version.regex}</regexMessage>
+									<regexMessage>
+										Project version(${project.version}) format is invalid! validation regex pattern: ${maven.enforcer.pom.version.regex}
+									</regexMessage>
 								</requireProperty>
 							</rules>
 						</configuration>
@@ -708,7 +713,7 @@
 				</property>
 			</activation>
 			<properties>
-				<maven.enforcer.pom.version.regex>${release.pom.version.regex}</maven.enforcer.pom.version.regex>
+				<maven.enforcer.pom.version.regex>${ga.release.pom.version.regex}</maven.enforcer.pom.version.regex>
 			</properties>
 		</profile>
 		<profile>
@@ -721,7 +726,7 @@
 				</property>
 			</activation>
 			<properties>
-				<maven.enforcer.pom.version.regex>${release.pom.version.regex}</maven.enforcer.pom.version.regex>
+				<maven.enforcer.pom.version.regex>${ga.release.pom.version.regex}</maven.enforcer.pom.version.regex>
 			</properties>
 		</profile>
 
diff --git a/scripts/bump_cffu_version.sh b/scripts/bump_cffu_version.sh
index 8bfe7e30..f37a85d5 100755
--- a/scripts/bump_cffu_version.sh
+++ b/scripts/bump_cffu_version.sh
@@ -13,8 +13,10 @@ source "$SELF_DIR/bash-buddy/lib/common_utils.sh"
 # shellcheck disable=SC2154
 [ $# -ne 2 ] && cu::die "need only 2 argument for old and new versions!"
 
-readonly old_version=$1
-readonly new_version=$2
+readonly OLD_VERSION=$1
+readonly OLD_ALPHA_VERSION=$1-Alpha
+readonly NEW_VERSION=$2
+readonly NEW_ALPHA_VERSION=$2-Alpha
 
 ignoreFailRg() {
   rg "$@" || true
@@ -25,6 +27,12 @@ myXargs() {
 }
 
 
-ignoreFailRg '1.x-SNAPSHOT' -Fl -g '!scripts/' | myXargs sd -F '1.x-SNAPSHOT' "$new_version"
 
-ignoreFailRg "$old_version" -Fl -g '!scripts/' | myXargs sd -F "$old_version" "$new_version"
+cu::log_then_run sed -i -r \
+  's/(\s*).*UPDATE to Alpha version WHEN RELEASE.*/\1<version>'"$NEW_ALPHA_VERSION"'<\/version>/' \
+  pom.xml ./*/pom.xml ./*/*/pom.xml
+
+ignoreFailRg "$OLD_ALPHA_VERSION" -Fl -g '!scripts/' | myXargs sd -F "$OLD_ALPHA_VERSION" "$NEW_ALPHA_VERSION"
+ignoreFailRg '1.x-SNAPSHOT' -Fl -g '!scripts/' | myXargs sd -F '1.x-SNAPSHOT' "$NEW_VERSION"
+
+ignoreFailRg "$OLD_VERSION" -Fl -g '!scripts/' | myXargs sd -F "$OLD_VERSION" "$NEW_VERSION"