diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index fa69080d..35f82ad1 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-m23-SNAPSHOT</version>
+        <version>5.8.0-m24</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml
index 39cf7666..c1b7a3ad 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-m23-SNAPSHOT</version>
+        <version>5.8.0-m24</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/performance/pom.xml b/modules/performance/pom.xml
index 776b44f9..fa881e1c 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-m23-SNAPSHOT</version>
+        <version>5.8.0-m24</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 e95f44ac..1f9aab90 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-m23-SNAPSHOT</version>
+        <version>5.8.0-m24</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 2d40d8a0..93c34a4f 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-m23-SNAPSHOT</version>
+        <version>5.8.0-m24</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 30ca8cfb..ee50e35a 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-m23-SNAPSHOT</version>
+        <version>5.8.0-m24</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 8adc37e7..bb8d9531 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-m23-SNAPSHOT</version>
+        <version>5.8.0-m24</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 5b3c58e9..ba9e9932 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-m23-SNAPSHOT</version>
+        <version>5.8.0-m24</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 60ccbbf5..9e5fe84d 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-m23-SNAPSHOT</version>
+        <version>5.8.0-m24</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 6b4ec8f0..6a5bc6a2 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-m23-SNAPSHOT</version>
+        <version>5.8.0-m24</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 272c1aac..c94c1f31 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-m23-SNAPSHOT</version>
+        <version>5.8.0-m24</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 d81f5d01..6368c370 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-m23-SNAPSHOT</version>
+        <version>5.8.0-m24</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/sample-clients/pom.xml b/modules/samples/sample-clients/pom.xml
index 4ca3267d..98fa7c50 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-m23-SNAPSHOT</version>
+        <version>5.8.0-m24</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 7de59929..34c9cacf 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-m23-SNAPSHOT</version>
+        <version>5.8.0-m24</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 672d4a57..94c1bc92 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-m23-SNAPSHOT</version>
+        <version>5.8.0-m24</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 1fd281ff..adb9cf16 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-m23-SNAPSHOT</version>
+        <version>5.8.0-m24</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 8ba58e8e..f40be720 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-m23-SNAPSHOT</version>
+        <version>5.8.0-m24</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 db7b3a8c..ed1b878d 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-m23-SNAPSHOT</version>
+        <version>5.8.0-m24</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 0637b1e0..af314c41 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-m23-SNAPSHOT</version>
+        <version>5.8.0-m24</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 5bf95e48..43077237 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-m23-SNAPSHOT</version>
+        <version>5.8.0-m24</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 9393e421..3b7695c9 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-m23-SNAPSHOT</version>
+        <version>5.8.0-m24</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/tests/pom.xml b/modules/tests/pom.xml
index d8efcdad..70f89666 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-m23-SNAPSHOT</version>
+        <version>5.8.0-m24</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index 128d2c0a..3c2839f8 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-m23-SNAPSHOT</version>
+    <version>5.8.0-m24</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>HEAD</tag>
+        <tag>v5.8.0-m24</tag>
     </scm>
 
     <dependencyManagement>