diff --git a/java/carrier/pom.xml b/java/carrier/pom.xml
index 5321d007f..4f357a0c1 100644
--- a/java/carrier/pom.xml
+++ b/java/carrier/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>carrier</artifactId>
-  <version>2.20</version>
+  <version>2.21-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>carrier</name>
   <url>https://github.com/google/libphonenumber/</url>
@@ -10,7 +10,7 @@
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>9.0.20</version>
+    <version>9.0.21-SNAPSHOT</version>
   </parent>
 
   <build>
@@ -82,12 +82,12 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>9.0.20</version>
+      <version>9.0.21-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>prefixmapper</artifactId>
-      <version>3.20</version>
+      <version>3.21-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/java/demo/pom.xml b/java/demo/pom.xml
index 5e26225b9..e54f43cd3 100644
--- a/java/demo/pom.xml
+++ b/java/demo/pom.xml
@@ -3,14 +3,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>demo</artifactId>
-  <version>9.0.20</version>
+  <version>9.0.21-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>demo</name>
   <url>https://github.com/google/libphonenumber/</url>
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>9.0.20</version>
+    <version>9.0.21-SNAPSHOT</version>
   </parent>
 
   <properties>
@@ -69,17 +69,17 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>9.0.20</version>
+      <version>9.0.21-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>geocoder</artifactId>
-      <version>3.20</version>
+      <version>3.21-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>carrier</artifactId>
-      <version>2.20</version>
+      <version>2.21-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/java/geocoder/pom.xml b/java/geocoder/pom.xml
index f0cf4c302..ac7a759f4 100644
--- a/java/geocoder/pom.xml
+++ b/java/geocoder/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>geocoder</artifactId>
-  <version>3.20</version>
+  <version>3.21-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>geocoder</name>
   <url>https://github.com/google/libphonenumber/</url>
@@ -10,7 +10,7 @@
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>9.0.20</version>
+    <version>9.0.21-SNAPSHOT</version>
   </parent>
 
   <build>
@@ -92,12 +92,12 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>9.0.20</version>
+      <version>9.0.21-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>prefixmapper</artifactId>
-      <version>3.20</version>
+      <version>3.21-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/java/internal/prefixmapper/pom.xml b/java/internal/prefixmapper/pom.xml
index 6edb0381a..bbc796bd0 100644
--- a/java/internal/prefixmapper/pom.xml
+++ b/java/internal/prefixmapper/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>prefixmapper</artifactId>
-  <version>3.20</version>
+  <version>3.21-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>prefixmapper</name>
   <url>https://github.com/google/libphonenumber/</url>
@@ -10,7 +10,7 @@
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>9.0.20</version>
+    <version>9.0.21-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -84,7 +84,7 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>9.0.20</version>
+      <version>9.0.21-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/java/libphonenumber/pom.xml b/java/libphonenumber/pom.xml
index d04e4c44b..2bfc0c347 100644
--- a/java/libphonenumber/pom.xml
+++ b/java/libphonenumber/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>libphonenumber</artifactId>
-  <version>9.0.20</version>
+  <version>9.0.21-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>libphonenumber</name>
   <url>https://github.com/google/libphonenumber/</url>
@@ -10,7 +10,7 @@
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>9.0.20</version>
+    <version>9.0.21-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/java/pom.xml b/java/pom.xml
index e01a8ff13..cc476302e 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>libphonenumber-parent</artifactId>
-  <version>9.0.20</version>
+  <version>9.0.21-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>libphonenumber-parent</name>
   <url>https://github.com/google/libphonenumber/</url>
@@ -32,7 +32,7 @@
     <developerConnection>scm:git:git@github.com:googlei18n/libphonenumber.git
     </developerConnection>
     <url>https://github.com/google/libphonenumber/</url>
-    <tag>v9.0.20</tag>
+    <tag>v9.0.16</tag>
   </scm>
 
   <properties>