diff --git a/HowToContribute.md b/HowToContribute.md
index 5b73e900..085c9f1b 100644
--- a/HowToContribute.md
+++ b/HowToContribute.md
@@ -27,7 +27,7 @@ mvn clean install -DskipTests
 ```
 
 ## Version management
-Developing version naming convention is like `0.2.0-SNAPSHOT`. Release version naming convention is like `0.2.0`. Please don't update version if no release plan. 
+Developing version naming convention is like `2.0.0-SNAPSHOT`. Release version naming convention is like `2.0.0`. Please don't update version if no release plan. 
 
 ## CI
 Both [Travis](https://travis-ci.org/Microsoft/azure-spring-boot) and [Appveyor](https://ci.appveyor.com/project/yungez/azure-spring-boot) CI is enabled.
diff --git a/azure-spring-boot-bom/pom.xml b/azure-spring-boot-bom/pom.xml
index 358fcbca..ba7bb805 100644
--- a/azure-spring-boot-bom/pom.xml
+++ b/azure-spring-boot-bom/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.microsoft.azure</groupId>
     <artifactId>azure-spring-boot-bom</artifactId>
-    <version>0.2.4-SNAPSHOT</version>
+    <version>2.0.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Azure Spring Boot BOM</name>
@@ -61,42 +61,42 @@
             <dependency>
                 <groupId>com.microsoft.azure</groupId>
                 <artifactId>azure-spring-boot-starter</artifactId>
-                <version>0.2.4-SNAPSHOT</version>
+                <version>2.0.1-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.microsoft.azure</groupId>
                 <artifactId>azure-active-directory-spring-boot-starter</artifactId>
-                <version>0.2.4-SNAPSHOT</version>
+                <version>2.0.1-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.microsoft.azure</groupId>
                 <artifactId>azure-documentdb-spring-boot-starter</artifactId>
-                <version>0.2.4-SNAPSHOT</version>
+                <version>2.0.1-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.microsoft.azure</groupId>
                 <artifactId>azure-storage-spring-boot-starter</artifactId>
-                <version>0.2.4-SNAPSHOT</version>
+                <version>2.0.1-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.microsoft.azure</groupId>
                 <artifactId>azure-servicebus-spring-boot-starter</artifactId>
-                <version>0.2.4-SNAPSHOT</version>
+                <version>2.0.1-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.microsoft.azure</groupId>
                 <artifactId>azure-keyvault-secrets-spring-boot-starter</artifactId>
-                <version>0.2.4-SNAPSHOT</version>
+                <version>2.0.1-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.microsoft.azure</groupId>
                 <artifactId>azure-mediaservices-spring-boot-starter</artifactId>
-                <version>0.2.4-SNAPSHOT</version>
+                <version>2.0.1-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.microsoft.azure</groupId>
                 <artifactId>azure-spring-boot</artifactId>
-                <version>0.2.4-SNAPSHOT</version>
+                <version>2.0.1-SNAPSHOT</version>
             </dependency>
 
             <!-- Spring Data Cosmos DB library -->
diff --git a/azure-spring-boot-parent/pom.xml b/azure-spring-boot-parent/pom.xml
index e717552f..c7d91a65 100644
--- a/azure-spring-boot-parent/pom.xml
+++ b/azure-spring-boot-parent/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-spring-boot-bom</artifactId>
-        <version>0.2.4-SNAPSHOT</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../azure-spring-boot-bom/pom.xml</relativePath>
     </parent>
 
@@ -75,6 +75,11 @@
                 <artifactId>powermock-api-mockito2</artifactId>
                 <version>1.7.0</version>
             </dependency>
+            <dependency>
+                <groupId>org.json</groupId>
+                <artifactId>json</artifactId>
+                <version>20171018</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/azure-spring-boot-samples/pom.xml b/azure-spring-boot-samples/pom.xml
index a2a07647..a2a93f1a 100644
--- a/azure-spring-boot-samples/pom.xml
+++ b/azure-spring-boot-samples/pom.xml
@@ -66,7 +66,7 @@
             <dependency>
                 <groupId>com.microsoft.azure</groupId>
                 <artifactId>azure-spring-boot-bom</artifactId>
-                <version>0.2.4-SNAPSHOT</version>
+                <version>2.0.1-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/azure-spring-boot-starters/azure-active-directory-spring-boot-starter/pom.xml b/azure-spring-boot-starters/azure-active-directory-spring-boot-starter/pom.xml
index 980ad969..1fa7ee56 100644
--- a/azure-spring-boot-starters/azure-active-directory-spring-boot-starter/pom.xml
+++ b/azure-spring-boot-starters/azure-active-directory-spring-boot-starter/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-spring-boot-parent</artifactId>
-        <version>0.2.4-SNAPSHOT</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../../azure-spring-boot-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/azure-spring-boot-starters/azure-documentdb-spring-boot-starter/pom.xml b/azure-spring-boot-starters/azure-documentdb-spring-boot-starter/pom.xml
index dfd2e7d3..36e6f7f5 100644
--- a/azure-spring-boot-starters/azure-documentdb-spring-boot-starter/pom.xml
+++ b/azure-spring-boot-starters/azure-documentdb-spring-boot-starter/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-spring-boot-parent</artifactId>
-        <version>0.2.4-SNAPSHOT</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../../azure-spring-boot-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/azure-spring-boot-starters/azure-keyvault-secrets-spring-boot-starter/pom.xml b/azure-spring-boot-starters/azure-keyvault-secrets-spring-boot-starter/pom.xml
index 302b3814..e9671c49 100644
--- a/azure-spring-boot-starters/azure-keyvault-secrets-spring-boot-starter/pom.xml
+++ b/azure-spring-boot-starters/azure-keyvault-secrets-spring-boot-starter/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-spring-boot-parent</artifactId>
-        <version>0.2.4-SNAPSHOT</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../../azure-spring-boot-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/azure-spring-boot-starters/azure-mediaservices-spring-boot-starter/pom.xml b/azure-spring-boot-starters/azure-mediaservices-spring-boot-starter/pom.xml
index e5b0ab88..22bae61c 100644
--- a/azure-spring-boot-starters/azure-mediaservices-spring-boot-starter/pom.xml
+++ b/azure-spring-boot-starters/azure-mediaservices-spring-boot-starter/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-spring-boot-parent</artifactId>
-        <version>0.2.4-SNAPSHOT</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../../azure-spring-boot-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/azure-spring-boot-starters/azure-servicebus-spring-boot-starter/pom.xml b/azure-spring-boot-starters/azure-servicebus-spring-boot-starter/pom.xml
index 491456e1..e20a1a55 100644
--- a/azure-spring-boot-starters/azure-servicebus-spring-boot-starter/pom.xml
+++ b/azure-spring-boot-starters/azure-servicebus-spring-boot-starter/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-spring-boot-parent</artifactId>
-        <version>0.2.4-SNAPSHOT</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../../azure-spring-boot-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/azure-spring-boot-starters/azure-spring-boot-starter/pom.xml b/azure-spring-boot-starters/azure-spring-boot-starter/pom.xml
index 03317b04..6f0bd5e7 100644
--- a/azure-spring-boot-starters/azure-spring-boot-starter/pom.xml
+++ b/azure-spring-boot-starters/azure-spring-boot-starter/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-spring-boot-parent</artifactId>
-        <version>0.2.4-SNAPSHOT</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../../azure-spring-boot-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/azure-spring-boot-starters/azure-storage-spring-boot-starter/pom.xml b/azure-spring-boot-starters/azure-storage-spring-boot-starter/pom.xml
index c90eefa1..db8292d6 100644
--- a/azure-spring-boot-starters/azure-storage-spring-boot-starter/pom.xml
+++ b/azure-spring-boot-starters/azure-storage-spring-boot-starter/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-spring-boot-parent</artifactId>
-        <version>0.2.4-SNAPSHOT</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../../azure-spring-boot-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/azure-spring-boot-starters/pom.xml b/azure-spring-boot-starters/pom.xml
index 6db3a96a..73ebca53 100644
--- a/azure-spring-boot-starters/pom.xml
+++ b/azure-spring-boot-starters/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-spring-boot-parent</artifactId>
-        <version>0.2.4-SNAPSHOT</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../azure-spring-boot-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/azure-spring-boot/pom.xml b/azure-spring-boot/pom.xml
index f3a76c57..dab5d3fb 100644
--- a/azure-spring-boot/pom.xml
+++ b/azure-spring-boot/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-spring-boot-parent</artifactId>
-        <version>0.2.4-SNAPSHOT</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../azure-spring-boot-parent/pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,6 @@
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
-            <version>20171018</version>
         </dependency>
 
         <!--Cloud Foundry support-->
diff --git a/pom.xml b/pom.xml
index 137ba2dd..c3ffa6f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.microsoft.azure</groupId>
     <artifactId>azure-spring-boot-build</artifactId>
-    <version>0.2.4-SNAPSHOT</version>
+    <version>2.0.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Azure Spring Boot Build</name>