diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 2d798faf..fa69080d 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.analytics.is</groupId>
         <artifactId>org.wso2.carbon.analytics.is.parent</artifactId>
-        <version>5.8.0-m22</version>
+        <version>5.8.0-m23-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml
index 60996a74..39cf7666 100644
--- a/modules/integration/pom.xml
+++ b/modules/integration/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.analytics.is</groupId>
         <artifactId>org.wso2.carbon.analytics.is.parent</artifactId>
-        <version>5.8.0-m22</version>
+        <version>5.8.0-m23-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/performance/pom.xml b/modules/performance/pom.xml
index 6e0ec3dd..776b44f9 100644
--- a/modules/performance/pom.xml
+++ b/modules/performance/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.analytics.is</groupId>
         <artifactId>org.wso2.carbon.analytics.is.parent</artifactId>
-        <version>5.8.0-m22</version>
+        <version>5.8.0-m23-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/sample-clients/http-client/pom.xml b/modules/samples/sample-clients/http-client/pom.xml
index 8c6bcc57..e95f44ac 100644
--- a/modules/samples/sample-clients/http-client/pom.xml
+++ b/modules/samples/sample-clients/http-client/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.analytics.is</groupId>
         <artifactId>sample-clients</artifactId>
-        <version>5.8.0-m22</version>
+        <version>5.8.0-m23-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/sample-clients/http-server/pom.xml b/modules/samples/sample-clients/http-server/pom.xml
index 55c1ec1f..2d40d8a0 100644
--- a/modules/samples/sample-clients/http-server/pom.xml
+++ b/modules/samples/sample-clients/http-server/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.analytics.is</groupId>
         <artifactId>sample-clients</artifactId>
-        <version>5.8.0-m22</version>
+        <version>5.8.0-m23-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/sample-clients/is-analytics-client/pom.xml b/modules/samples/sample-clients/is-analytics-client/pom.xml
index 73fc634a..30ca8cfb 100644
--- a/modules/samples/sample-clients/is-analytics-client/pom.xml
+++ b/modules/samples/sample-clients/is-analytics-client/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.analytics.is</groupId>
         <artifactId>sample-clients</artifactId>
-        <version>5.8.0-m22</version>
+        <version>5.8.0-m23-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/sample-clients/jms-consumer/pom.xml b/modules/samples/sample-clients/jms-consumer/pom.xml
index e7c2339b..8adc37e7 100644
--- a/modules/samples/sample-clients/jms-consumer/pom.xml
+++ b/modules/samples/sample-clients/jms-consumer/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.analytics.is</groupId>
         <artifactId>sample-clients</artifactId>
-        <version>5.8.0-m22</version>
+        <version>5.8.0-m23-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/sample-clients/jms-producer/pom.xml b/modules/samples/sample-clients/jms-producer/pom.xml
index 1973b605..5b3c58e9 100644
--- a/modules/samples/sample-clients/jms-producer/pom.xml
+++ b/modules/samples/sample-clients/jms-producer/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.analytics.is</groupId>
         <artifactId>sample-clients</artifactId>
-        <version>5.8.0-m22</version>
+        <version>5.8.0-m23-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/sample-clients/kafka-consumer/pom.xml b/modules/samples/sample-clients/kafka-consumer/pom.xml
index 48ee6c42..60ccbbf5 100644
--- a/modules/samples/sample-clients/kafka-consumer/pom.xml
+++ b/modules/samples/sample-clients/kafka-consumer/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.analytics.is</groupId>
         <artifactId>sample-clients</artifactId>
-        <version>5.8.0-m22</version>
+        <version>5.8.0-m23-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/sample-clients/kafka-producer/pom.xml b/modules/samples/sample-clients/kafka-producer/pom.xml
index 3dcb6e01..6b4ec8f0 100644
--- a/modules/samples/sample-clients/kafka-producer/pom.xml
+++ b/modules/samples/sample-clients/kafka-producer/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.analytics.is</groupId>
         <artifactId>sample-clients</artifactId>
-        <version>5.8.0-m22</version>
+        <version>5.8.0-m23-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/sample-clients/mqtt-client/pom.xml b/modules/samples/sample-clients/mqtt-client/pom.xml
index 4f86ce36..272c1aac 100644
--- a/modules/samples/sample-clients/mqtt-client/pom.xml
+++ b/modules/samples/sample-clients/mqtt-client/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.analytics.is</groupId>
         <artifactId>sample-clients</artifactId>
-        <version>5.8.0-m22</version>
+        <version>5.8.0-m23-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/sample-clients/mqtt-consumer/pom.xml b/modules/samples/sample-clients/mqtt-consumer/pom.xml
index bdab1fe6..d81f5d01 100644
--- a/modules/samples/sample-clients/mqtt-consumer/pom.xml
+++ b/modules/samples/sample-clients/mqtt-consumer/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.analytics.is</groupId>
         <artifactId>sample-clients</artifactId>
-        <version>5.8.0-m22</version>
+        <version>5.8.0-m23-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/sample-clients/pom.xml b/modules/samples/sample-clients/pom.xml
index b7cdf37b..4ca3267d 100644
--- a/modules/samples/sample-clients/pom.xml
+++ b/modules/samples/sample-clients/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.analytics.is</groupId>
         <artifactId>org.wso2.carbon.analytics.is.parent</artifactId>
-        <version>5.8.0-m22</version>
+        <version>5.8.0-m23-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/sample-clients/rabbitmq-consumer/pom.xml b/modules/samples/sample-clients/rabbitmq-consumer/pom.xml
index c0d4a3b9..7de59929 100644
--- a/modules/samples/sample-clients/rabbitmq-consumer/pom.xml
+++ b/modules/samples/sample-clients/rabbitmq-consumer/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.analytics.is</groupId>
         <artifactId>sample-clients</artifactId>
-        <version>5.8.0-m22</version>
+        <version>5.8.0-m23-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/sample-clients/rabbitmq-producer/pom.xml b/modules/samples/sample-clients/rabbitmq-producer/pom.xml
index ba6928f6..672d4a57 100644
--- a/modules/samples/sample-clients/rabbitmq-producer/pom.xml
+++ b/modules/samples/sample-clients/rabbitmq-producer/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.analytics.is</groupId>
         <artifactId>sample-clients</artifactId>
-        <version>5.8.0-m22</version>
+        <version>5.8.0-m23-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/sample-clients/tcp-client/pom.xml b/modules/samples/sample-clients/tcp-client/pom.xml
index 9ded8d4e..1fd281ff 100644
--- a/modules/samples/sample-clients/tcp-client/pom.xml
+++ b/modules/samples/sample-clients/tcp-client/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.analytics.is</groupId>
         <artifactId>sample-clients</artifactId>
-        <version>5.8.0-m22</version>
+        <version>5.8.0-m23-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/sample-clients/tcp-server/pom.xml b/modules/samples/sample-clients/tcp-server/pom.xml
index d97dc270..8ba58e8e 100644
--- a/modules/samples/sample-clients/tcp-server/pom.xml
+++ b/modules/samples/sample-clients/tcp-server/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.analytics.is</groupId>
         <artifactId>sample-clients</artifactId>
-        <version>5.8.0-m22</version>
+        <version>5.8.0-m23-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/sample-clients/websocket-producer/pom.xml b/modules/samples/sample-clients/websocket-producer/pom.xml
index af67308e..db7b3a8c 100644
--- a/modules/samples/sample-clients/websocket-producer/pom.xml
+++ b/modules/samples/sample-clients/websocket-producer/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.analytics.is</groupId>
         <artifactId>sample-clients</artifactId>
-        <version>5.8.0-m22</version>
+        <version>5.8.0-m23-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/samples/sample-clients/websocket-receiver/pom.xml b/modules/samples/sample-clients/websocket-receiver/pom.xml
index 70287d1e..0637b1e0 100644
--- a/modules/samples/sample-clients/websocket-receiver/pom.xml
+++ b/modules/samples/sample-clients/websocket-receiver/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.analytics.is</groupId>
         <artifactId>sample-clients</artifactId>
-        <version>5.8.0-m22</version>
+        <version>5.8.0-m23-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/samples/sample-clients/wso2event-client/pom.xml b/modules/samples/sample-clients/wso2event-client/pom.xml
index 1aa0f456..5bf95e48 100644
--- a/modules/samples/sample-clients/wso2event-client/pom.xml
+++ b/modules/samples/sample-clients/wso2event-client/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.analytics.is</groupId>
         <artifactId>sample-clients</artifactId>
-        <version>5.8.0-m22</version>
+        <version>5.8.0-m23-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/sample-clients/wso2event-server/pom.xml b/modules/samples/sample-clients/wso2event-server/pom.xml
index 3fcfe0ea..9393e421 100644
--- a/modules/samples/sample-clients/wso2event-server/pom.xml
+++ b/modules/samples/sample-clients/wso2event-server/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.analytics.is</groupId>
         <artifactId>sample-clients</artifactId>
-        <version>5.8.0-m22</version>
+        <version>5.8.0-m23-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/tests/pom.xml b/modules/tests/pom.xml
index 5a082464..d8efcdad 100644
--- a/modules/tests/pom.xml
+++ b/modules/tests/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.analytics.is</groupId>
         <artifactId>org.wso2.carbon.analytics.is.parent</artifactId>
-        <version>5.8.0-m22</version>
+        <version>5.8.0-m23-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index 9e03b2c6..128d2c0a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
     <groupId>org.wso2.analytics.is</groupId>
     <artifactId>org.wso2.carbon.analytics.is.parent</artifactId>
     <packaging>pom</packaging>
-    <version>5.8.0-m22</version>
+    <version>5.8.0-m23-SNAPSHOT</version>
     <name>WSO2 Analytics Identity Server - Parent</name>
 
     <url>http://wso2.org</url>
@@ -37,7 +37,7 @@
         <url>https://github.com/wso2/analytics-is.git</url>
         <developerConnection>scm:git:https://github.com/wso2/analytics-is.git</developerConnection>
         <connection>scm:git:https://github.com/wso2/analytics-is.git</connection>
-        <tag>v5.8.0-m22</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <dependencyManagement>