diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 5dbf05a7..331772ed 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-beta5-SNAPSHOT</version>
+        <version>5.8.0-beta5</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml
index 6fa1feef..9aa8ead2 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-beta5-SNAPSHOT</version>
+        <version>5.8.0-beta5</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/performance/pom.xml b/modules/performance/pom.xml
index 65e396c7..652fb994 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-beta5-SNAPSHOT</version>
+        <version>5.8.0-beta5</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 76c00070..dedfd370 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-beta5-SNAPSHOT</version>
+        <version>5.8.0-beta5</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 3a3242c0..1f952c19 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-beta5-SNAPSHOT</version>
+        <version>5.8.0-beta5</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 1884cccd..0336547a 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-beta5-SNAPSHOT</version>
+        <version>5.8.0-beta5</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 da21d5d9..80167221 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-beta5-SNAPSHOT</version>
+        <version>5.8.0-beta5</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 c296ecdb..d5d9c37d 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-beta5-SNAPSHOT</version>
+        <version>5.8.0-beta5</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 2fbec01d..b273ccb5 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-beta5-SNAPSHOT</version>
+        <version>5.8.0-beta5</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 1689dadb..e37fe7b6 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-beta5-SNAPSHOT</version>
+        <version>5.8.0-beta5</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 39e401f7..69a79aee 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-beta5-SNAPSHOT</version>
+        <version>5.8.0-beta5</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 ad691502..0de9e542 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-beta5-SNAPSHOT</version>
+        <version>5.8.0-beta5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/sample-clients/pom.xml b/modules/samples/sample-clients/pom.xml
index 494e0ef3..81c3d273 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-beta5-SNAPSHOT</version>
+        <version>5.8.0-beta5</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 8f03071f..d053b972 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-beta5-SNAPSHOT</version>
+        <version>5.8.0-beta5</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 a810db77..33eca630 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-beta5-SNAPSHOT</version>
+        <version>5.8.0-beta5</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 c87d160c..0146afb8 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-beta5-SNAPSHOT</version>
+        <version>5.8.0-beta5</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 a36a964c..75f612d2 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-beta5-SNAPSHOT</version>
+        <version>5.8.0-beta5</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 466822de..15ce8727 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-beta5-SNAPSHOT</version>
+        <version>5.8.0-beta5</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 7a2bb71b..19e638f8 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-beta5-SNAPSHOT</version>
+        <version>5.8.0-beta5</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 99483d6c..c828252d 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-beta5-SNAPSHOT</version>
+        <version>5.8.0-beta5</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 71db3cb9..d2621262 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-beta5-SNAPSHOT</version>
+        <version>5.8.0-beta5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/tests/pom.xml b/modules/tests/pom.xml
index 7bf0252c..f0663c4a 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-beta5-SNAPSHOT</version>
+        <version>5.8.0-beta5</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index 57cd52d7..1278ab0e 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-beta5-SNAPSHOT</version>
+    <version>5.8.0-beta5</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-beta5</tag>
     </scm>
 
     <dependencyManagement>