diff --git a/bookkeeper-benchmark/pom.xml b/bookkeeper-benchmark/pom.xml
index 5bae84448d3..bdb82cb5647 100644
--- a/bookkeeper-benchmark/pom.xml
+++ b/bookkeeper-benchmark/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>bookkeeper</artifactId>
     <groupId>org.apache.bookkeeper</groupId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
   </parent>
   <groupId>org.apache.bookkeeper</groupId>
   <artifactId>bookkeeper-benchmark</artifactId>
diff --git a/bookkeeper-common-allocator/pom.xml b/bookkeeper-common-allocator/pom.xml
index 33b65f2240f..eac95eef2ec 100644
--- a/bookkeeper-common-allocator/pom.xml
+++ b/bookkeeper-common-allocator/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.bookkeeper</groupId>
     <artifactId>bookkeeper</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
   </parent>
   <artifactId>bookkeeper-common-allocator</artifactId>
   <name>Apache BookKeeper :: Common :: Allocator</name>
diff --git a/bookkeeper-common/pom.xml b/bookkeeper-common/pom.xml
index c587cfdb801..25d0f1604bc 100644
--- a/bookkeeper-common/pom.xml
+++ b/bookkeeper-common/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.bookkeeper</groupId>
     <artifactId>bookkeeper</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
   </parent>
   <artifactId>bookkeeper-common</artifactId>
   <name>Apache BookKeeper :: Common</name>
diff --git a/bookkeeper-dist/all/pom.xml b/bookkeeper-dist/all/pom.xml
index 13c76d35ffa..47d91e6b68d 100644
--- a/bookkeeper-dist/all/pom.xml
+++ b/bookkeeper-dist/all/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>bookkeeper-dist</artifactId>
     <groupId>org.apache.bookkeeper</groupId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
@@ -154,8 +154,4 @@
       </plugin>
     </plugins>
   </build>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/bookkeeper-dist/bkctl/pom.xml b/bookkeeper-dist/bkctl/pom.xml
index 2e211f341b9..222a9192c67 100644
--- a/bookkeeper-dist/bkctl/pom.xml
+++ b/bookkeeper-dist/bkctl/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>bookkeeper-dist</artifactId>
     <groupId>org.apache.bookkeeper</groupId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
@@ -79,8 +79,4 @@
       </plugin>
     </plugins>
   </build>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/bookkeeper-dist/pom.xml b/bookkeeper-dist/pom.xml
index 227e5d4c22b..892b185044f 100644
--- a/bookkeeper-dist/pom.xml
+++ b/bookkeeper-dist/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <artifactId>bookkeeper</artifactId>
     <groupId>org.apache.bookkeeper</groupId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>bookkeeper-dist</artifactId>
diff --git a/bookkeeper-dist/server/pom.xml b/bookkeeper-dist/server/pom.xml
index a0cd8ee4f80..52c40121ba3 100644
--- a/bookkeeper-dist/server/pom.xml
+++ b/bookkeeper-dist/server/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>bookkeeper-dist</artifactId>
     <groupId>org.apache.bookkeeper</groupId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
@@ -129,8 +129,4 @@
 
     </plugins>
   </build>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/bookkeeper-http/http-server/pom.xml b/bookkeeper-http/http-server/pom.xml
index b1e58907176..b8923105be2 100644
--- a/bookkeeper-http/http-server/pom.xml
+++ b/bookkeeper-http/http-server/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <artifactId>bookkeeper</artifactId>
     <groupId>org.apache.bookkeeper</groupId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
     <relativePath>../..</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/bookkeeper-http/pom.xml b/bookkeeper-http/pom.xml
index ecfd743637e..729115a0e5d 100644
--- a/bookkeeper-http/pom.xml
+++ b/bookkeeper-http/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <artifactId>bookkeeper</artifactId>
     <groupId>org.apache.bookkeeper</groupId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.bookkeeper.http</groupId>
diff --git a/bookkeeper-http/servlet-http-server/pom.xml b/bookkeeper-http/servlet-http-server/pom.xml
index 04515c502b2..eef6d199d1e 100644
--- a/bookkeeper-http/servlet-http-server/pom.xml
+++ b/bookkeeper-http/servlet-http-server/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>bookkeeper</artifactId>
         <groupId>org.apache.bookkeeper</groupId>
-        <version>4.16.4</version>
+        <version>4.16.4-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/bookkeeper-http/vertx-http-server/pom.xml b/bookkeeper-http/vertx-http-server/pom.xml
index dc34c3ddb0a..f2601e5a953 100644
--- a/bookkeeper-http/vertx-http-server/pom.xml
+++ b/bookkeeper-http/vertx-http-server/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <artifactId>bookkeeper</artifactId>
     <groupId>org.apache.bookkeeper</groupId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
     <relativePath>../..</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/bookkeeper-proto/pom.xml b/bookkeeper-proto/pom.xml
index fdb143aae0f..b56a17f5699 100644
--- a/bookkeeper-proto/pom.xml
+++ b/bookkeeper-proto/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>bookkeeper</artifactId>
     <groupId>org.apache.bookkeeper</groupId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
   </parent>
   <artifactId>bookkeeper-proto</artifactId>
   <name>Apache BookKeeper :: Protocols</name>
diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml
index 31c647a9d37..ebf4772b959 100644
--- a/bookkeeper-server/pom.xml
+++ b/bookkeeper-server/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>bookkeeper</artifactId>
     <groupId>org.apache.bookkeeper</groupId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
   </parent>
   <artifactId>bookkeeper-server</artifactId>
   <name>Apache BookKeeper :: Server</name>
diff --git a/bookkeeper-slogger/api/pom.xml b/bookkeeper-slogger/api/pom.xml
index 7df5510622e..8d936a5f844 100644
--- a/bookkeeper-slogger/api/pom.xml
+++ b/bookkeeper-slogger/api/pom.xml
@@ -18,14 +18,10 @@
     <parent>
         <artifactId>bookkeeper-slogger-parent</artifactId>
         <groupId>org.apache.bookkeeper</groupId>
-        <version>4.16.4</version>
+        <version>4.16.4-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
     <groupId>org.apache.bookkeeper</groupId>
     <artifactId>bookkeeper-slogger-api</artifactId>
     <name>Apache BookKeeper :: Structured Logger :: API</name>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/bookkeeper-slogger/pom.xml b/bookkeeper-slogger/pom.xml
index 791efb6eb89..ddb67bf6d28 100644
--- a/bookkeeper-slogger/pom.xml
+++ b/bookkeeper-slogger/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.bookkeeper</groupId>
         <artifactId>bookkeeper</artifactId>
-        <version>4.16.4</version>
+        <version>4.16.4-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
     <packaging>pom</packaging>
diff --git a/bookkeeper-slogger/slf4j/pom.xml b/bookkeeper-slogger/slf4j/pom.xml
index 7893646b44c..34d25cb1610 100644
--- a/bookkeeper-slogger/slf4j/pom.xml
+++ b/bookkeeper-slogger/slf4j/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>bookkeeper-slogger-parent</artifactId>
         <groupId>org.apache.bookkeeper</groupId>
-        <version>4.16.4</version>
+        <version>4.16.4-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
     <groupId>org.apache.bookkeeper</groupId>
@@ -31,8 +31,4 @@
             <version>${project.parent.version}</version>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/buildtools/pom.xml b/buildtools/pom.xml
index 6eac2d73f56..f29f77df900 100644
--- a/buildtools/pom.xml
+++ b/buildtools/pom.xml
@@ -20,9 +20,9 @@
   <parent>
     <groupId>org.apache.bookkeeper</groupId>
     <artifactId>bookkeeper</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
   </parent>
   <artifactId>buildtools</artifactId>
   <name>Apache BookKeeper :: Build Tools</name>
-  <version>4.16.4</version>
+  <version>4.16.4-SNAPSHOT</version>
 </project>
diff --git a/circe-checksum/pom.xml b/circe-checksum/pom.xml
index db791f856e1..5a5b85ee11c 100644
--- a/circe-checksum/pom.xml
+++ b/circe-checksum/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.bookkeeper</groupId>
     <artifactId>bookkeeper</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
diff --git a/cpu-affinity/pom.xml b/cpu-affinity/pom.xml
index c4d8a7a1c48..bf4e83b9043 100644
--- a/cpu-affinity/pom.xml
+++ b/cpu-affinity/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.apache.bookkeeper</groupId>
     <artifactId>bookkeeper</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
diff --git a/metadata-drivers/etcd/pom.xml b/metadata-drivers/etcd/pom.xml
index 230c7f369dd..a85f033d7d9 100644
--- a/metadata-drivers/etcd/pom.xml
+++ b/metadata-drivers/etcd/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.apache.bookkeeper.metadata.drivers</groupId>
     <artifactId>metadata-drivers-parent</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -158,8 +158,4 @@
       </build>
     </profile>
   </profiles>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/metadata-drivers/pom.xml b/metadata-drivers/pom.xml
index d83c0835283..5c2a0748225 100644
--- a/metadata-drivers/pom.xml
+++ b/metadata-drivers/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>bookkeeper</artifactId>
         <groupId>org.apache.bookkeeper</groupId>
-        <version>4.16.4</version>
+        <version>4.16.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.bookkeeper.metadata.drivers</groupId>
diff --git a/microbenchmarks/pom.xml b/microbenchmarks/pom.xml
index f5d8f6a6b6f..63c9400cd4a 100644
--- a/microbenchmarks/pom.xml
+++ b/microbenchmarks/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.bookkeeper</groupId>
     <artifactId>bookkeeper</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
   </parent>
   <artifactId>microbenchmarks</artifactId>
   <name>Apache BookKeeper :: microbenchmarks</name>
diff --git a/native-io/pom.xml b/native-io/pom.xml
index 0cff14834af..40e428d0577 100644
--- a/native-io/pom.xml
+++ b/native-io/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.apache.bookkeeper</groupId>
     <artifactId>bookkeeper</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
diff --git a/pom.xml b/pom.xml
index 5864db2fd82..57b5910597d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.bookkeeper</groupId>
-  <version>4.16.4</version>
+  <version>4.16.4-SNAPSHOT</version>
   <artifactId>bookkeeper</artifactId>
   <packaging>pom</packaging>
   <name>Apache BookKeeper :: Parent</name>
@@ -40,7 +40,7 @@
     <connection>scm:git:https://github.com/apache/bookkeeper.git</connection>
     <developerConnection>scm:git:https://github.com/apache/bookkeeper.git</developerConnection>
     <url>https://github.com/apache/bookkeeper</url>
-    <tag>v4.16.4-rc0</tag>
+    <tag>branch-4.16</tag>
   </scm>
   <issueManagement>
     <system>JIRA</system>
diff --git a/shaded/bookkeeper-server-shaded/pom.xml b/shaded/bookkeeper-server-shaded/pom.xml
index e34091a5c83..85a3408fd6d 100644
--- a/shaded/bookkeeper-server-shaded/pom.xml
+++ b/shaded/bookkeeper-server-shaded/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.bookkeeper</groupId>
     <artifactId>shaded-parent</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>bookkeeper-server-shaded</artifactId>
@@ -126,8 +126,4 @@
       </plugin>
     </plugins>
   </build>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/shaded/bookkeeper-server-tests-shaded/pom.xml b/shaded/bookkeeper-server-tests-shaded/pom.xml
index a4b9b9c60fb..f9ccbc1bd6c 100644
--- a/shaded/bookkeeper-server-tests-shaded/pom.xml
+++ b/shaded/bookkeeper-server-tests-shaded/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.bookkeeper</groupId>
     <artifactId>shaded-parent</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>bookkeeper-server-tests-shaded</artifactId>
@@ -144,8 +144,4 @@
       </plugin>
     </plugins>
   </build>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/shaded/distributedlog-core-shaded/pom.xml b/shaded/distributedlog-core-shaded/pom.xml
index c331049c6f6..f66b3c15bff 100644
--- a/shaded/distributedlog-core-shaded/pom.xml
+++ b/shaded/distributedlog-core-shaded/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.bookkeeper</groupId>
     <artifactId>shaded-parent</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <groupId>org.apache.distributedlog</groupId>
@@ -238,8 +238,4 @@
       </plugin>
     </plugins>
   </build>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/shaded/pom.xml b/shaded/pom.xml
index aed6f399c54..6a3680ca5dc 100644
--- a/shaded/pom.xml
+++ b/shaded/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.bookkeeper</groupId>
     <artifactId>bookkeeper</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
   </parent>
   <groupId>org.apache.bookkeeper</groupId>
   <artifactId>shaded-parent</artifactId>
diff --git a/stats/bookkeeper-stats-api/pom.xml b/stats/bookkeeper-stats-api/pom.xml
index e54d7e954e8..2423b007b8e 100644
--- a/stats/bookkeeper-stats-api/pom.xml
+++ b/stats/bookkeeper-stats-api/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>bookkeeper-stats-parent</artifactId>
     <groupId>org.apache.bookkeeper.stats</groupId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
   </parent>
   <groupId>org.apache.bookkeeper.stats</groupId>
   <artifactId>bookkeeper-stats-api</artifactId>
@@ -59,8 +59,4 @@
   </build>
   <dependencies>
   </dependencies>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml
index f60870d9f75..5a177e97ef5 100644
--- a/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml
+++ b/stats/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>bookkeeper-stats-providers</artifactId>
     <groupId>org.apache.bookkeeper.stats</groupId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
   </parent>
   <groupId>org.apache.bookkeeper.stats</groupId>
   <artifactId>codahale-metrics-provider</artifactId>
@@ -53,8 +53,4 @@
       <artifactId>guava</artifactId>
     </dependency>
   </dependencies>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/stats/bookkeeper-stats-providers/pom.xml b/stats/bookkeeper-stats-providers/pom.xml
index 8b61d2e3921..2255ddeee60 100644
--- a/stats/bookkeeper-stats-providers/pom.xml
+++ b/stats/bookkeeper-stats-providers/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <artifactId>bookkeeper-stats-parent</artifactId>
     <groupId>org.apache.bookkeeper.stats</groupId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>bookkeeper-stats-providers</artifactId>
@@ -29,8 +29,4 @@
     <module>codahale-metrics-provider</module>
     <module>prometheus-metrics-provider</module>
   </modules>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml
index 4733e105993..0edc2704dbf 100644
--- a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml
+++ b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>bookkeeper-stats-providers</artifactId>
     <groupId>org.apache.bookkeeper.stats</groupId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
   </parent>
   <groupId>org.apache.bookkeeper.stats</groupId>
   <artifactId>prometheus-metrics-provider</artifactId>
@@ -72,8 +72,4 @@
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/stats/pom.xml b/stats/pom.xml
index ebc699ffdb3..d5cc4f2ccc3 100644
--- a/stats/pom.xml
+++ b/stats/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.bookkeeper</groupId>
     <artifactId>bookkeeper</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
   </parent>
   <packaging>pom</packaging>
   <groupId>org.apache.bookkeeper.stats</groupId>
diff --git a/stats/utils/pom.xml b/stats/utils/pom.xml
index 076ac917f3c..39710f59788 100644
--- a/stats/utils/pom.xml
+++ b/stats/utils/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>bookkeeper-stats-parent</artifactId>
     <groupId>org.apache.bookkeeper.stats</groupId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
   </parent>
   <groupId>org.apache.bookkeeper.stats</groupId>
   <artifactId>bookkeeper-stats-utils</artifactId>
@@ -50,8 +50,4 @@
       <artifactId>jackson-annotations</artifactId>
     </dependency>
   </dependencies>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/stream/api/pom.xml b/stream/api/pom.xml
index 2d6fdcf0170..761f0f44b43 100644
--- a/stream/api/pom.xml
+++ b/stream/api/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>stream-storage-parent</artifactId>
     <groupId>org.apache.bookkeeper</groupId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <groupId>org.apache.bookkeeper</groupId>
@@ -46,8 +46,4 @@
       <artifactId>freebuilder</artifactId>
     </dependency>
   </dependencies>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/stream/bk-grpc-name-resolver/pom.xml b/stream/bk-grpc-name-resolver/pom.xml
index 86f0c41969a..912c9c06741 100644
--- a/stream/bk-grpc-name-resolver/pom.xml
+++ b/stream/bk-grpc-name-resolver/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>stream-storage-parent</artifactId>
     <groupId>org.apache.bookkeeper</groupId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <groupId>org.apache.bookkeeper</groupId>
@@ -77,8 +77,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/stream/clients/java/all/pom.xml b/stream/clients/java/all/pom.xml
index f449df499a9..9ee0082b776 100644
--- a/stream/clients/java/all/pom.xml
+++ b/stream/clients/java/all/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.bookkeeper</groupId>
     <artifactId>stream-storage-java-client-parent</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
   </parent>
   <artifactId>stream-storage-java-client</artifactId>
   <name>Apache BookKeeper :: Stream Storage :: Clients :: Java Client </name>
@@ -112,8 +112,4 @@
       </plugin>
     </plugins>
   </build>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/stream/clients/java/base/pom.xml b/stream/clients/java/base/pom.xml
index aab32d03473..a6f028b0b38 100644
--- a/stream/clients/java/base/pom.xml
+++ b/stream/clients/java/base/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.bookkeeper</groupId>
     <artifactId>stream-storage-java-client-parent</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
   </parent>
   <artifactId>stream-storage-java-client-base</artifactId>
   <name>Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: Base</name>
@@ -59,8 +59,4 @@
       </plugin>
     </plugins>
   </build>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/stream/clients/java/kv/pom.xml b/stream/clients/java/kv/pom.xml
index d0f8e5c8a6d..936621fba83 100644
--- a/stream/clients/java/kv/pom.xml
+++ b/stream/clients/java/kv/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.bookkeeper</groupId>
     <artifactId>stream-storage-java-client-parent</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
   </parent>
   <artifactId>stream-storage-java-kv-client</artifactId>
   <name>Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: KV</name>
@@ -47,8 +47,4 @@
   </dependencies>
   <build>
   </build>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/stream/clients/java/pom.xml b/stream/clients/java/pom.xml
index 299d6103ccd..3cbca66086b 100644
--- a/stream/clients/java/pom.xml
+++ b/stream/clients/java/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.bookkeeper</groupId>
     <artifactId>stream-storage-clients-parent</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>stream-storage-java-client-parent</artifactId>
@@ -31,8 +31,4 @@
     <module>kv</module>
     <module>all</module>
   </modules>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/stream/clients/pom.xml b/stream/clients/pom.xml
index 7036585dec9..6f72e1f835c 100644
--- a/stream/clients/pom.xml
+++ b/stream/clients/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.bookkeeper</groupId>
     <artifactId>stream-storage-parent</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>stream-storage-clients-parent</artifactId>
@@ -47,8 +47,4 @@
       </plugin>
     </plugins>
   </build>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/stream/common/pom.xml b/stream/common/pom.xml
index 482943591c6..d7f63439df9 100644
--- a/stream/common/pom.xml
+++ b/stream/common/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>stream-storage-parent</artifactId>
     <groupId>org.apache.bookkeeper</groupId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <groupId>org.apache.bookkeeper</groupId>
@@ -82,8 +82,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/stream/distributedlog/common/pom.xml b/stream/distributedlog/common/pom.xml
index 8778d91d4cd..24fc27e764e 100644
--- a/stream/distributedlog/common/pom.xml
+++ b/stream/distributedlog/common/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.distributedlog</groupId>
     <artifactId>distributedlog</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
   </parent>
   <artifactId>distributedlog-common</artifactId>
   <name>Apache BookKeeper :: DistributedLog :: Common</name>
@@ -106,8 +106,4 @@
       </plugin>
     </plugins>
   </build>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/stream/distributedlog/core/pom.xml b/stream/distributedlog/core/pom.xml
index 099a06ee805..2cbdde34c36 100644
--- a/stream/distributedlog/core/pom.xml
+++ b/stream/distributedlog/core/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.distributedlog</groupId>
     <artifactId>distributedlog</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
   </parent>
   <artifactId>distributedlog-core</artifactId>
   <name>Apache BookKeeper :: DistributedLog :: Core Library</name>
@@ -138,8 +138,4 @@
       </plugin>
     </plugins>
   </build>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/stream/distributedlog/io/dlfs/pom.xml b/stream/distributedlog/io/dlfs/pom.xml
index a19e13c282e..c102819feda 100644
--- a/stream/distributedlog/io/dlfs/pom.xml
+++ b/stream/distributedlog/io/dlfs/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>distributedlog</artifactId>
     <groupId>org.apache.distributedlog</groupId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
     <relativePath>../..</relativePath>
   </parent>
   <groupId>org.apache.distributedlog</groupId>
@@ -100,8 +100,4 @@
       </plugin>
     </plugins>
   </build>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/stream/distributedlog/io/pom.xml b/stream/distributedlog/io/pom.xml
index ff5eba8a6cd..7d58702f080 100644
--- a/stream/distributedlog/io/pom.xml
+++ b/stream/distributedlog/io/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.apache.distributedlog</groupId>
     <artifactId>distributedlog</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>distributedlog-io</artifactId>
@@ -28,8 +28,4 @@
   <modules>
     <module>dlfs</module>
   </modules>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/stream/distributedlog/pom.xml b/stream/distributedlog/pom.xml
index 58b2307d3f4..08e5ed3d88d 100644
--- a/stream/distributedlog/pom.xml
+++ b/stream/distributedlog/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.bookkeeper</groupId>
     <artifactId>bookkeeper</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
     <relativePath>../..</relativePath>
   </parent>
   <groupId>org.apache.distributedlog</groupId>
diff --git a/stream/distributedlog/protocol/pom.xml b/stream/distributedlog/protocol/pom.xml
index 1e745e7ee7f..289ed4f0889 100644
--- a/stream/distributedlog/protocol/pom.xml
+++ b/stream/distributedlog/protocol/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.distributedlog</groupId>
     <artifactId>distributedlog</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
   </parent>
   <artifactId>distributedlog-protocol</artifactId>
   <name>Apache BookKeeper :: DistributedLog :: Protocol</name>
@@ -61,8 +61,4 @@
       </plugin>
     </plugins>
   </build>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/stream/pom.xml b/stream/pom.xml
index a98ae984551..bb960504b0f 100644
--- a/stream/pom.xml
+++ b/stream/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.bookkeeper</groupId>
     <artifactId>bookkeeper</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <packaging>pom</packaging>
diff --git a/stream/proto/pom.xml b/stream/proto/pom.xml
index 92574a26d7c..99639e46a87 100644
--- a/stream/proto/pom.xml
+++ b/stream/proto/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.bookkeeper</groupId>
     <artifactId>stream-storage-parent</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <groupId>org.apache.bookkeeper</groupId>
@@ -118,8 +118,4 @@
       </plugin>
     </plugins>
   </build>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/stream/server/pom.xml b/stream/server/pom.xml
index 60cec3f26e5..514bce17c11 100644
--- a/stream/server/pom.xml
+++ b/stream/server/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.bookkeeper</groupId>
     <artifactId>stream-storage-parent</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
   </parent>
   <artifactId>stream-storage-server</artifactId>
   <name>Apache BookKeeper :: Stream Storage :: Server</name>
@@ -82,8 +82,4 @@
       </plugin>
     </plugins>
   </build>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/stream/statelib/pom.xml b/stream/statelib/pom.xml
index f986fa945cd..b0bc7706509 100644
--- a/stream/statelib/pom.xml
+++ b/stream/statelib/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>stream-storage-parent</artifactId>
     <groupId>org.apache.bookkeeper</groupId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <groupId>org.apache.bookkeeper</groupId>
@@ -130,8 +130,4 @@
       </plugin>
     </plugins>
   </build>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/stream/storage/api/pom.xml b/stream/storage/api/pom.xml
index 589432bfebd..0d6d352cea6 100644
--- a/stream/storage/api/pom.xml
+++ b/stream/storage/api/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.bookkeeper</groupId>
     <artifactId>stream-storage-service-parent</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>stream-storage-service-api</artifactId>
@@ -55,8 +55,4 @@
       </plugin>
     </plugins>
   </build>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/stream/storage/impl/pom.xml b/stream/storage/impl/pom.xml
index 8080e08b492..cb9b00dd890 100644
--- a/stream/storage/impl/pom.xml
+++ b/stream/storage/impl/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.bookkeeper</groupId>
     <artifactId>stream-storage-service-parent</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>stream-storage-service-impl</artifactId>
@@ -121,8 +121,4 @@
       </plugin>
     </plugins>
   </build>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/stream/storage/pom.xml b/stream/storage/pom.xml
index 7079aba241e..be326a996f6 100644
--- a/stream/storage/pom.xml
+++ b/stream/storage/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.bookkeeper</groupId>
     <artifactId>stream-storage-parent</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>stream-storage-service-parent</artifactId>
@@ -30,8 +30,4 @@
     <module>api</module>
     <module>impl</module>
   </modules>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml
index a0baa5f069d..4349f73c5f0 100644
--- a/stream/tests-common/pom.xml
+++ b/stream/tests-common/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.bookkeeper</groupId>
     <artifactId>stream-storage-parent</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <groupId>org.apache.bookkeeper.tests</groupId>
@@ -123,8 +123,4 @@
       </plugin>
     </plugins>
   </build>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/tests/backward-compat/bc-non-fips/pom.xml b/tests/backward-compat/bc-non-fips/pom.xml
index fa9654e6875..3bd0fa870cb 100644
--- a/tests/backward-compat/bc-non-fips/pom.xml
+++ b/tests/backward-compat/bc-non-fips/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.bookkeeper.tests</groupId>
     <artifactId>backward-compat</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
@@ -76,8 +76,4 @@
       </plugin>
     </plugins>
   </build>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/tests/backward-compat/current-server-old-clients/pom.xml b/tests/backward-compat/current-server-old-clients/pom.xml
index 1601b61ee6d..59692e55fdf 100644
--- a/tests/backward-compat/current-server-old-clients/pom.xml
+++ b/tests/backward-compat/current-server-old-clients/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.bookkeeper.tests</groupId>
     <artifactId>backward-compat</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
@@ -28,8 +28,4 @@
   <artifactId>backward-compat-current-server-old-clients</artifactId>
   <packaging>jar</packaging>
   <name>Apache BookKeeper :: Tests :: Backward Compatibility :: Test old clients working on current server</name>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/tests/backward-compat/hierarchical-ledger-manager/pom.xml b/tests/backward-compat/hierarchical-ledger-manager/pom.xml
index 3934ffc7087..dde37c87246 100644
--- a/tests/backward-compat/hierarchical-ledger-manager/pom.xml
+++ b/tests/backward-compat/hierarchical-ledger-manager/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.bookkeeper.tests</groupId>
     <artifactId>backward-compat</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
@@ -28,8 +28,4 @@
   <artifactId>hierarchical-ledger-manager</artifactId>
   <packaging>jar</packaging>
   <name>Apache BookKeeper :: Tests :: Backward Compatibility :: Test compat between old version and new version of hierarchical ledger manager</name>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/tests/backward-compat/hostname-bookieid/pom.xml b/tests/backward-compat/hostname-bookieid/pom.xml
index 804f363ab78..befc066d751 100644
--- a/tests/backward-compat/hostname-bookieid/pom.xml
+++ b/tests/backward-compat/hostname-bookieid/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.bookkeeper.tests</groupId>
     <artifactId>backward-compat</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
@@ -28,8 +28,4 @@
   <artifactId>hostname-bookieid</artifactId>
   <packaging>jar</packaging>
   <name>Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between 4.1.0 and current version (with hostname bookie ID)</name>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/tests/backward-compat/old-cookie-new-cluster/pom.xml b/tests/backward-compat/old-cookie-new-cluster/pom.xml
index b4c7af40570..1241fc732a2 100644
--- a/tests/backward-compat/old-cookie-new-cluster/pom.xml
+++ b/tests/backward-compat/old-cookie-new-cluster/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.bookkeeper.tests</groupId>
     <artifactId>backward-compat</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
@@ -28,8 +28,4 @@
   <artifactId>old-cookie-new-cluster</artifactId>
   <packaging>jar</packaging>
   <name>Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade 4.1.0 to current in cluster with cookies</name>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/tests/backward-compat/pom.xml b/tests/backward-compat/pom.xml
index 4d044d65595..692cca42c1c 100644
--- a/tests/backward-compat/pom.xml
+++ b/tests/backward-compat/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.bookkeeper.tests</groupId>
     <artifactId>integration-tests-base-groovy</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
     <relativePath>../integration-tests-base-groovy</relativePath>
   </parent>
   <groupId>org.apache.bookkeeper.tests</groupId>
@@ -49,8 +49,4 @@
       </plugin>
     </plugins>
   </build>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/tests/backward-compat/recovery-no-password/pom.xml b/tests/backward-compat/recovery-no-password/pom.xml
index b95b21021d2..deda6a66428 100644
--- a/tests/backward-compat/recovery-no-password/pom.xml
+++ b/tests/backward-compat/recovery-no-password/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.bookkeeper.tests</groupId>
     <artifactId>backward-compat</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
@@ -36,8 +36,4 @@
       <version>${project.version}</version>
     </dependency>
   </dependencies>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/tests/backward-compat/upgrade-direct/pom.xml b/tests/backward-compat/upgrade-direct/pom.xml
index 2b5985f0c3d..2f54fc1a24d 100644
--- a/tests/backward-compat/upgrade-direct/pom.xml
+++ b/tests/backward-compat/upgrade-direct/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.bookkeeper.tests</groupId>
     <artifactId>backward-compat</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
@@ -28,8 +28,4 @@
   <artifactId>upgrade-direct</artifactId>
   <packaging>jar</packaging>
   <name>Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between 4.1.0 and current version</name>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/tests/backward-compat/upgrade/pom.xml b/tests/backward-compat/upgrade/pom.xml
index a2fbd23bad9..43e601d51b3 100644
--- a/tests/backward-compat/upgrade/pom.xml
+++ b/tests/backward-compat/upgrade/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.bookkeeper.tests</groupId>
     <artifactId>backward-compat</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
@@ -28,8 +28,4 @@
   <artifactId>upgrade</artifactId>
   <packaging>jar</packaging>
   <name>Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between all released versions and current version</name>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/tests/backward-compat/yahoo-custom-version/pom.xml b/tests/backward-compat/yahoo-custom-version/pom.xml
index b5200be8832..3eebc908f3b 100644
--- a/tests/backward-compat/yahoo-custom-version/pom.xml
+++ b/tests/backward-compat/yahoo-custom-version/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.bookkeeper.tests</groupId>
     <artifactId>backward-compat</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
@@ -28,8 +28,4 @@
   <artifactId>yahoo-custom-version</artifactId>
   <packaging>jar</packaging>
   <name>Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade between yahoo custom version and current</name>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/tests/docker-images/all-released-versions-image/pom.xml b/tests/docker-images/all-released-versions-image/pom.xml
index c0d817bd180..d89fd3100ac 100644
--- a/tests/docker-images/all-released-versions-image/pom.xml
+++ b/tests/docker-images/all-released-versions-image/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.apache.bookkeeper.tests</groupId>
     <artifactId>docker-images</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.bookkeeper.tests</groupId>
@@ -68,8 +68,4 @@
       </build>
     </profile>
   </profiles>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/tests/docker-images/all-versions-image/pom.xml b/tests/docker-images/all-versions-image/pom.xml
index d4bca3f2287..057dc6db3c8 100644
--- a/tests/docker-images/all-versions-image/pom.xml
+++ b/tests/docker-images/all-versions-image/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.apache.bookkeeper.tests</groupId>
     <artifactId>docker-images</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.bookkeeper.tests</groupId>
@@ -108,8 +108,4 @@
       </build>
     </profile>
   </profiles>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/tests/docker-images/pom.xml b/tests/docker-images/pom.xml
index 7e50a49783c..fad8e528a3f 100644
--- a/tests/docker-images/pom.xml
+++ b/tests/docker-images/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.bookkeeper.tests</groupId>
     <artifactId>tests-parent</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
   </parent>
   <groupId>org.apache.bookkeeper.tests</groupId>
   <artifactId>docker-images</artifactId>
@@ -30,8 +30,4 @@
     <module>all-released-versions-image</module>
     <module>all-versions-image</module>
   </modules>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/tests/integration-tests-base-groovy/pom.xml b/tests/integration-tests-base-groovy/pom.xml
index be83b193344..5c02d9966c1 100644
--- a/tests/integration-tests-base-groovy/pom.xml
+++ b/tests/integration-tests-base-groovy/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.bookkeeper.tests</groupId>
     <artifactId>integration-tests-base</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
     <relativePath>../integration-tests-base</relativePath>
   </parent>
 
@@ -109,8 +109,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/tests/integration-tests-base/pom.xml b/tests/integration-tests-base/pom.xml
index 1ee3b4d387b..65cc9ca012c 100644
--- a/tests/integration-tests-base/pom.xml
+++ b/tests/integration-tests-base/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.bookkeeper.tests</groupId>
     <artifactId>tests-parent</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.bookkeeper.tests</groupId>
@@ -89,8 +89,4 @@
       </build>
     </profile>
   </profiles>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/tests/integration-tests-topologies/pom.xml b/tests/integration-tests-topologies/pom.xml
index 6a4793c4f6f..42c9069b845 100644
--- a/tests/integration-tests-topologies/pom.xml
+++ b/tests/integration-tests-topologies/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.bookkeeper.tests</groupId>
     <artifactId>tests-parent</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.bookkeeper.tests</groupId>
@@ -45,8 +45,4 @@
       <version>${project.version}</version>
     </dependency>
   </dependencies>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/tests/integration-tests-utils/pom.xml b/tests/integration-tests-utils/pom.xml
index 55eeed659a5..e8a87f87cb8 100644
--- a/tests/integration-tests-utils/pom.xml
+++ b/tests/integration-tests-utils/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.bookkeeper.tests</groupId>
     <artifactId>tests-parent</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.bookkeeper.tests</groupId>
@@ -89,8 +89,4 @@
       </plugin>
     </plugins>
   </build>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/tests/integration/cluster/pom.xml b/tests/integration/cluster/pom.xml
index bc95216ebde..c4696604416 100644
--- a/tests/integration/cluster/pom.xml
+++ b/tests/integration/cluster/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.bookkeeper.tests</groupId>
     <artifactId>integration</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
@@ -83,8 +83,4 @@
       </plugin>
     </plugins>
   </build>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml
index 9680cc3d666..03419ec4b33 100644
--- a/tests/integration/pom.xml
+++ b/tests/integration/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.bookkeeper.tests</groupId>
     <artifactId>tests-parent</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
   </parent>
   <groupId>org.apache.bookkeeper.tests</groupId>
   <artifactId>integration</artifactId>
@@ -70,8 +70,4 @@
       </build>
     </profile>
   </profiles>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/tests/integration/smoke/pom.xml b/tests/integration/smoke/pom.xml
index 49dca4408d6..5bdaa7da3a8 100644
--- a/tests/integration/smoke/pom.xml
+++ b/tests/integration/smoke/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.bookkeeper.tests</groupId>
     <artifactId>integration</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
@@ -72,8 +72,4 @@
       </plugin>
     </plugins>
   </build>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/tests/integration/standalone/pom.xml b/tests/integration/standalone/pom.xml
index 32a233bd9be..1ccfd94f5d7 100644
--- a/tests/integration/standalone/pom.xml
+++ b/tests/integration/standalone/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.bookkeeper.tests</groupId>
     <artifactId>integration</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
@@ -68,8 +68,4 @@
       </plugin>
     </plugins>
   </build>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/tests/pom.xml b/tests/pom.xml
index 16245a304cb..900836365aa 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.bookkeeper</groupId>
     <artifactId>bookkeeper</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
   </parent>
   <groupId>org.apache.bookkeeper.tests</groupId>
   <artifactId>tests-parent</artifactId>
diff --git a/tests/scripts/pom.xml b/tests/scripts/pom.xml
index bdacc143b4f..0efb891691c 100644
--- a/tests/scripts/pom.xml
+++ b/tests/scripts/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.bookkeeper.tests</groupId>
     <artifactId>tests-parent</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.bookkeeper.tests</groupId>
@@ -73,8 +73,4 @@
       </plugin>
     </plugins>
   </build>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/tests/shaded/bookkeeper-server-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-shaded-test/pom.xml
index 52271ca4a36..00e791ef6f9 100644
--- a/tests/shaded/bookkeeper-server-shaded-test/pom.xml
+++ b/tests/shaded/bookkeeper-server-shaded-test/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.bookkeeper.tests.shaded</groupId>
     <artifactId>shaded-tests-parent</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>bookkeeper-server-shaded-test</artifactId>
@@ -59,8 +59,4 @@
       </plugin>
     </plugins>
   </build>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml
index a697894f01e..3274c5a5214 100644
--- a/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml
+++ b/tests/shaded/bookkeeper-server-tests-shaded-test/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.bookkeeper.tests.shaded</groupId>
     <artifactId>shaded-tests-parent</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>bookkeeper-server-tests-shaded-test</artifactId>
@@ -75,8 +75,4 @@
       </plugin>
     </plugins>
   </build>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/tests/shaded/distributedlog-core-shaded-test/pom.xml b/tests/shaded/distributedlog-core-shaded-test/pom.xml
index c34b406f6de..e6335c32534 100644
--- a/tests/shaded/distributedlog-core-shaded-test/pom.xml
+++ b/tests/shaded/distributedlog-core-shaded-test/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.bookkeeper.tests.shaded</groupId>
     <artifactId>shaded-tests-parent</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>distributedlog-core-shaded-test</artifactId>
@@ -84,8 +84,4 @@
       </plugin>
     </plugins>
   </build>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/tests/shaded/pom.xml b/tests/shaded/pom.xml
index 64cdb6d30e6..d510eba453c 100644
--- a/tests/shaded/pom.xml
+++ b/tests/shaded/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.bookkeeper.tests</groupId>
     <artifactId>tests-parent</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <groupId>org.apache.bookkeeper.tests.shaded</groupId>
@@ -32,8 +32,4 @@
     <module>bookkeeper-server-tests-shaded-test</module>
     <module>distributedlog-core-shaded-test</module>
   </modules>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/testtools/pom.xml b/testtools/pom.xml
index ea4c0ec6aa0..359dbf7ad6e 100644
--- a/testtools/pom.xml
+++ b/testtools/pom.xml
@@ -20,11 +20,11 @@
     <parent>
         <groupId>org.apache.bookkeeper</groupId>
         <artifactId>bookkeeper</artifactId>
-        <version>4.16.4</version>
+        <version>4.16.4-SNAPSHOT</version>
     </parent>
     <artifactId>testtools</artifactId>
     <name>Apache BookKeeper :: Test Tools</name>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
diff --git a/tools/all/pom.xml b/tools/all/pom.xml
index d987199b897..28190a5f479 100644
--- a/tools/all/pom.xml
+++ b/tools/all/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>bookkeeper-tools-parent</artifactId>
     <groupId>org.apache.bookkeeper</groupId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
   </parent>
   <artifactId>bookkeeper-tools</artifactId>
   <name>Apache BookKeeper :: Tools</name>
@@ -79,8 +79,4 @@
       </plugin>
     </plugins>
   </build>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/tools/framework/pom.xml b/tools/framework/pom.xml
index 72613e05d3a..8b2f8988fcc 100644
--- a/tools/framework/pom.xml
+++ b/tools/framework/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>bookkeeper-tools-parent</artifactId>
     <groupId>org.apache.bookkeeper</groupId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
   </parent>
   <artifactId>bookkeeper-tools-framework</artifactId>
   <name>Apache BookKeeper :: Tools :: Framework</name>
@@ -41,8 +41,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/tools/ledger/pom.xml b/tools/ledger/pom.xml
index 5a999808d73..1b055e348ad 100644
--- a/tools/ledger/pom.xml
+++ b/tools/ledger/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>bookkeeper-tools-parent</artifactId>
     <groupId>org.apache.bookkeeper</groupId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
   </parent>
   <artifactId>bookkeeper-tools-ledger</artifactId>
   <name>Apache BookKeeper :: Tools :: Ledger</name>
@@ -71,8 +71,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/tools/perf/pom.xml b/tools/perf/pom.xml
index d4f316606ec..1765770b485 100644
--- a/tools/perf/pom.xml
+++ b/tools/perf/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.apache.bookkeeper</groupId>
     <artifactId>bookkeeper-tools-parent</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
   </parent>
   <artifactId>bookkeeper-perf</artifactId>
   <name>Apache BookKeeper :: Tools :: Perf</name>
@@ -48,8 +48,4 @@
       <artifactId>HdrHistogram</artifactId>
     </dependency>
   </dependencies>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>
diff --git a/tools/pom.xml b/tools/pom.xml
index 03e3306e49d..c111e75d93e 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>bookkeeper</artifactId>
     <groupId>org.apache.bookkeeper</groupId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
   </parent>
   <artifactId>bookkeeper-tools-parent</artifactId>
   <name>Apache BookKeeper :: Tools :: Parent</name>
diff --git a/tools/stream/pom.xml b/tools/stream/pom.xml
index 0e26376cf9f..da62a144fdf 100644
--- a/tools/stream/pom.xml
+++ b/tools/stream/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.bookkeeper</groupId>
     <artifactId>bookkeeper-tools-parent</artifactId>
-    <version>4.16.4</version>
+    <version>4.16.4-SNAPSHOT</version>
   </parent>
   <artifactId>stream-storage-cli</artifactId>
   <name>Apache BookKeeper :: Tools :: Stream</name>
@@ -48,8 +48,4 @@
       <version>${project.version}</version>
     </dependency>
   </dependencies>
-
-  <scm>
-    <tag>v4.16.4-rc0</tag>
-  </scm>
 </project>