diff --git a/analytics-event-publisher-archetype/pom.xml b/analytics-event-publisher-archetype/pom.xml
index 41b4a0a..1f973ac 100755
--- a/analytics-event-publisher-archetype/pom.xml
+++ b/analytics-event-publisher-archetype/pom.xml
@@ -21,12 +21,12 @@
     <parent>
         <artifactId>carbon-extension-archetype</artifactId>
         <groupId>org.wso2.carbon.extension.archetype</groupId>
-        <version>2.0.16</version>
+        <version>2.0.17-SNAPSHOT</version>
     </parent>
 
     <packaging>maven-archetype</packaging>
     <artifactId>org.wso2.carbon.extension.analytics.publisher-archetype</artifactId>
-    <version>2.0.16</version>
+    <version>2.0.17-SNAPSHOT</version>
     <name>WSO2 Carbon - Analytics Publisher Archetype for Template</name>
     <url>http://wso2.org</url>
     <build>
diff --git a/analytics-event-receiver-archetype/pom.xml b/analytics-event-receiver-archetype/pom.xml
index 898fa07..2acb97e 100755
--- a/analytics-event-receiver-archetype/pom.xml
+++ b/analytics-event-receiver-archetype/pom.xml
@@ -4,12 +4,12 @@
     <parent>
         <artifactId>carbon-extension-archetype</artifactId>
         <groupId>org.wso2.carbon.extension.archetype</groupId>
-        <version>2.0.16</version>
+        <version>2.0.17-SNAPSHOT</version>
     </parent>
 
     <packaging>maven-archetype</packaging>
     <artifactId>org.wso2.carbon.extension.analytics.receiver-archetype</artifactId>
-    <version>2.0.16</version>
+    <version>2.0.17-SNAPSHOT</version>
     <name>WSO2 Carbon - Analytics Receiver Archetype for Template</name>
     <url>http://wso2.org</url>
     <build>
diff --git a/esb-connector-archetype/pom.xml b/esb-connector-archetype/pom.xml
index 02fb1e5..994ff87 100755
--- a/esb-connector-archetype/pom.xml
+++ b/esb-connector-archetype/pom.xml
@@ -21,10 +21,10 @@
     <parent>
         <groupId>org.wso2.carbon.extension.archetype</groupId>
         <artifactId>carbon-extension-archetype</artifactId>
-        <version>2.0.16</version>
+        <version>2.0.17-SNAPSHOT</version>
     </parent>
     <artifactId>org.wso2.carbon.extension.esb.connector-archetype</artifactId>
-    <version>2.0.16</version>
+    <version>2.0.17-SNAPSHOT</version>
     <packaging>maven-archetype</packaging>
     <name>WSO2 Carbon - Connector Archetype for Template</name>
     <build>
diff --git a/esb-project-archetype/pom.xml b/esb-project-archetype/pom.xml
index c93387f..681e90b 100644
--- a/esb-project-archetype/pom.xml
+++ b/esb-project-archetype/pom.xml
@@ -21,10 +21,10 @@
     <parent>
         <artifactId>carbon-extension-archetype</artifactId>
         <groupId>org.wso2.carbon.extension.archetype</groupId>
-        <version>2.0.16</version>
+        <version>2.0.17-SNAPSHOT</version>
     </parent>
     <artifactId>org.wso2.carbon.extension.esb.project-archetype</artifactId>
-    <version>2.0.16</version>
+    <version>2.0.17-SNAPSHOT</version>
     <packaging>maven-archetype</packaging>
     <name>WSO2 Carbon - Archetype for ESB Synapse Project</name>
     <build>
diff --git a/is-authenticator-archetype/pom.xml b/is-authenticator-archetype/pom.xml
index 72a590c..90dd659 100755
--- a/is-authenticator-archetype/pom.xml
+++ b/is-authenticator-archetype/pom.xml
@@ -21,11 +21,11 @@
     <parent>
         <groupId>org.wso2.carbon.extension.archetype</groupId>
         <artifactId>carbon-extension-archetype</artifactId>
-        <version>2.0.16</version>
+        <version>2.0.17-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.extension.is.authenticator-archetype</artifactId>
-    <version>2.0.16</version>
+    <version>2.0.17-SNAPSHOT</version>
     <packaging>maven-archetype</packaging>
     <name>WSO2 Carbon - Authenticator Archetype for Template</name>
     <description>Platform Parent pom hold the properties, plugins which are required to build carbon components, carbon
diff --git a/is-local-authenticator-archetype/pom.xml b/is-local-authenticator-archetype/pom.xml
index 4604fc4..875b414 100755
--- a/is-local-authenticator-archetype/pom.xml
+++ b/is-local-authenticator-archetype/pom.xml
@@ -23,11 +23,11 @@
     <parent>
         <groupId>org.wso2.carbon.extension.archetype</groupId>
         <artifactId>carbon-extension-archetype</artifactId>
-        <version>2.0.16</version>
+        <version>2.0.17-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.extension.is.local-authenticator-archetype</artifactId>
-    <version>2.0.16</version>
+    <version>2.0.17-SNAPSHOT</version>
     <packaging>maven-archetype</packaging>
     <name>WSO2 Identity Server - Local Authenticator Archetype</name>
     <url>http://wso2.org</url>
diff --git a/is-provisioning-connector-archetype/pom.xml b/is-provisioning-connector-archetype/pom.xml
index ca0dd80..3ad6d81 100755
--- a/is-provisioning-connector-archetype/pom.xml
+++ b/is-provisioning-connector-archetype/pom.xml
@@ -21,11 +21,11 @@
     <parent>
         <groupId>org.wso2.carbon.extension.archetype</groupId>
         <artifactId>carbon-extension-archetype</artifactId>
-        <version>2.0.16</version>
+        <version>2.0.17-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.extension.is.provisioning-connector-archetype</artifactId>
-    <version>2.0.16</version>
+    <version>2.0.17-SNAPSHOT</version>
     <packaging>maven-archetype</packaging>
 
     <name>WSO2 Carbon - Connector Archetype for Template</name>
diff --git a/pom.xml b/pom.xml
index d7af611..afd23f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
     </parent>
     <groupId>org.wso2.carbon.extension.archetype</groupId>
     <artifactId>carbon-extension-archetype</artifactId>
-    <version>2.0.16</version>
+    <version>2.0.17-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Extension Archetype Pom</name>
     <url>http://wso2.org</url>
@@ -56,7 +56,7 @@
         <url>https://github.com/wso2-extensions/archetypes.git</url>
         <developerConnection>scm:git:https://github.com/wso2-extensions/archetypes.git
         </developerConnection>
-        <tag>v2.0.16</tag>
+        <tag>HEAD</tag>
     </scm>
     <build>
         <extensions>
diff --git a/siddhi-aggregator-archetype/pom.xml b/siddhi-aggregator-archetype/pom.xml
index d97d393..77b6ce2 100755
--- a/siddhi-aggregator-archetype/pom.xml
+++ b/siddhi-aggregator-archetype/pom.xml
@@ -19,12 +19,12 @@
     <parent>
         <artifactId>carbon-extension-archetype</artifactId>
         <groupId>org.wso2.carbon.extension.archetype</groupId>
-        <version>2.0.16</version>
+        <version>2.0.17-SNAPSHOT</version>
     </parent>
 
     <packaging>maven-archetype</packaging>
     <artifactId>org.wso2.extension.siddhi.aggregator-archetype</artifactId>
-    <version>2.0.16</version>
+    <version>2.0.17-SNAPSHOT</version>
     <name>WSO2 Siddhi - Aggregator Archetype for Template</name>
     <url>http://wso2.org</url>
     <build>
diff --git a/siddhi-function-archetype/pom.xml b/siddhi-function-archetype/pom.xml
index 5f3f9de..268174e 100755
--- a/siddhi-function-archetype/pom.xml
+++ b/siddhi-function-archetype/pom.xml
@@ -19,11 +19,11 @@
     <parent>
         <artifactId>carbon-extension-archetype</artifactId>
         <groupId>org.wso2.carbon.extension.archetype</groupId>
-        <version>2.0.16</version>
+        <version>2.0.17-SNAPSHOT</version>
     </parent>
     <packaging>maven-archetype</packaging>
     <artifactId>org.wso2.extension.siddhi.function-archetype</artifactId>
-    <version>2.0.16</version>
+    <version>2.0.17-SNAPSHOT</version>
     <name>WSO2 Siddhi - Function Archetype for Template</name>
     <url>http://wso2.org</url>
     <build>
diff --git a/siddhi-stream-function-archetype/pom.xml b/siddhi-stream-function-archetype/pom.xml
index a16be0a..e0a8891 100755
--- a/siddhi-stream-function-archetype/pom.xml
+++ b/siddhi-stream-function-archetype/pom.xml
@@ -21,11 +21,11 @@
     <parent>
         <artifactId>carbon-extension-archetype</artifactId>
         <groupId>org.wso2.carbon.extension.archetype</groupId>
-        <version>2.0.16</version>
+        <version>2.0.17-SNAPSHOT</version>
     </parent>
     <packaging>maven-archetype</packaging>
     <artifactId>org.wso2.extension.siddhi.streamfunction-archetype</artifactId>
-    <version>2.0.16</version>
+    <version>2.0.17-SNAPSHOT</version>
     <name>WSO2 Siddhi - Stream Function Archetype for Template</name>
     <url>http://wso2.org</url>
     <build>
diff --git a/siddhi-stream-processor-archetype/pom.xml b/siddhi-stream-processor-archetype/pom.xml
index 823d2de..d16b173 100755
--- a/siddhi-stream-processor-archetype/pom.xml
+++ b/siddhi-stream-processor-archetype/pom.xml
@@ -4,11 +4,11 @@
     <parent>
         <artifactId>carbon-extension-archetype</artifactId>
         <groupId>org.wso2.carbon.extension.archetype</groupId>
-        <version>2.0.16</version>
+        <version>2.0.17-SNAPSHOT</version>
     </parent>
     <packaging>maven-archetype</packaging>
     <artifactId>org.wso2.extension.siddhi.streamprocessor-archetype</artifactId>
-    <version>2.0.16</version>
+    <version>2.0.17-SNAPSHOT</version>
     <name>WSO2 Siddhi - Stream Processor Archetype for Template</name>
     <url>http://wso2.org</url>
     <build>
diff --git a/siddhi-window-archetype/pom.xml b/siddhi-window-archetype/pom.xml
index fb3ee58..008ab31 100755
--- a/siddhi-window-archetype/pom.xml
+++ b/siddhi-window-archetype/pom.xml
@@ -4,12 +4,12 @@
     <parent>
         <artifactId>carbon-extension-archetype</artifactId>
         <groupId>org.wso2.carbon.extension.archetype</groupId>
-        <version>2.0.16</version>
+        <version>2.0.17-SNAPSHOT</version>
     </parent>
 
     <packaging>maven-archetype</packaging>
     <artifactId>org.wso2.extension.siddhi.window-archetype</artifactId>
-    <version>2.0.16</version>
+    <version>2.0.17-SNAPSHOT</version>
     <name>WSO2 Siddhi - Window Archetype for Template</name>
     <url>http://wso2.org</url>
     <build>