diff --git a/modules/authenticators/pom.xml b/modules/authenticators/pom.xml
index 01ef9fe6a7..55f1f70608 100644
--- a/modules/authenticators/pom.xml
+++ b/modules/authenticators/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-server-parent</artifactId>
-        <version>5.8.0-m2-SNAPSHOT</version>
+        <version>5.8.0-m2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/connectors/pom.xml b/modules/connectors/pom.xml
index 5600a2695d..6ea3c9e094 100644
--- a/modules/connectors/pom.xml
+++ b/modules/connectors/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-server-parent</artifactId>
-        <version>5.8.0-m2-SNAPSHOT</version>
+        <version>5.8.0-m2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index ba13bae990..b83fbd8581 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-server-parent</artifactId>
-        <version>5.8.0-m2-SNAPSHOT</version>
+        <version>5.8.0-m2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/features/org.wso2.identity.styles.feature/pom.xml b/modules/features/org.wso2.identity.styles.feature/pom.xml
index 8f021586ca..5e4a0cad52 100644
--- a/modules/features/org.wso2.identity.styles.feature/pom.xml
+++ b/modules/features/org.wso2.identity.styles.feature/pom.xml
@@ -20,7 +20,7 @@
 	<parent>
 		<groupId>org.wso2.is</groupId>
 		<artifactId>identity-features</artifactId>
-		<version>5.8.0-m2-SNAPSHOT</version>
+		<version>5.8.0-m2</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/modules/features/org.wso2.identity.ui.feature/pom.xml b/modules/features/org.wso2.identity.ui.feature/pom.xml
index 303d2bcddd..dc0bc42135 100644
--- a/modules/features/org.wso2.identity.ui.feature/pom.xml
+++ b/modules/features/org.wso2.identity.ui.feature/pom.xml
@@ -20,7 +20,7 @@
 	<parent>
 		<groupId>org.wso2.is</groupId>
 		<artifactId>identity-features</artifactId>
-		<version>5.8.0-m2-SNAPSHOT</version>
+		<version>5.8.0-m2</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/modules/features/org.wso2.identity.utils.feature/pom.xml b/modules/features/org.wso2.identity.utils.feature/pom.xml
index d2e4e6d485..d7c966e41f 100644
--- a/modules/features/org.wso2.identity.utils.feature/pom.xml
+++ b/modules/features/org.wso2.identity.utils.feature/pom.xml
@@ -20,7 +20,7 @@
 	<parent>
 		<groupId>org.wso2.is</groupId>
 		<artifactId>identity-features</artifactId>
-		<version>5.8.0-m2-SNAPSHOT</version>
+		<version>5.8.0-m2</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/modules/features/pom.xml b/modules/features/pom.xml
index 91a3d550dd..fd72a082de 100644
--- a/modules/features/pom.xml
+++ b/modules/features/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
     	<groupId>org.wso2.is</groupId>
     	<artifactId>identity-server-parent</artifactId>
-    	<version>5.8.0-m2-SNAPSHOT</version>
+    	<version>5.8.0-m2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml
index 1378a29bb2..5011d21c33 100644
--- a/modules/integration/pom.xml
+++ b/modules/integration/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-server-parent</artifactId>
-        <version>5.8.0-m2-SNAPSHOT</version>
+        <version>5.8.0-m2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/tests-common/admin-clients/pom.xml b/modules/integration/tests-common/admin-clients/pom.xml
index 57dfe17b3e..3699c78940 100644
--- a/modules/integration/tests-common/admin-clients/pom.xml
+++ b/modules/integration/tests-common/admin-clients/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-integration-tests</artifactId>
-        <version>5.8.0-m2-SNAPSHOT</version>
+        <version>5.8.0-m2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/tests-common/extensions/pom.xml b/modules/integration/tests-common/extensions/pom.xml
index e3ee6e5114..ecc00580f3 100644
--- a/modules/integration/tests-common/extensions/pom.xml
+++ b/modules/integration/tests-common/extensions/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-integration-tests</artifactId>
-        <version>5.8.0-m2-SNAPSHOT</version>
+        <version>5.8.0-m2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/tests-common/integration-test-utils/pom.xml b/modules/integration/tests-common/integration-test-utils/pom.xml
index 0b2be54682..fcfc66b143 100644
--- a/modules/integration/tests-common/integration-test-utils/pom.xml
+++ b/modules/integration/tests-common/integration-test-utils/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-integration-tests</artifactId>
-        <version>5.8.0-m2-SNAPSHOT</version>
+        <version>5.8.0-m2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/tests-common/pom.xml b/modules/integration/tests-common/pom.xml
index 77faf9c03f..66c14869f0 100644
--- a/modules/integration/tests-common/pom.xml
+++ b/modules/integration/tests-common/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-integration-tests</artifactId>
-        <version>5.8.0-m2-SNAPSHOT</version>
+        <version>5.8.0-m2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/tests-common/ui-pages/pom.xml b/modules/integration/tests-common/ui-pages/pom.xml
index f5b3f5f9ff..b6b1880305 100644
--- a/modules/integration/tests-common/ui-pages/pom.xml
+++ b/modules/integration/tests-common/ui-pages/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-integration-tests</artifactId>
-        <version>5.8.0-m2-SNAPSHOT</version>
+        <version>5.8.0-m2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/tests-integration/pom.xml b/modules/integration/tests-integration/pom.xml
index aa50a9c661..c06b7fde22 100644
--- a/modules/integration/tests-integration/pom.xml
+++ b/modules/integration/tests-integration/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-integration-tests</artifactId>
-        <version>5.8.0-m2-SNAPSHOT</version>
+        <version>5.8.0-m2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/tests-integration/tests-backend/pom.xml b/modules/integration/tests-integration/tests-backend/pom.xml
index c114ff88a9..a480c4bbad 100644
--- a/modules/integration/tests-integration/tests-backend/pom.xml
+++ b/modules/integration/tests-integration/tests-backend/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-integration-tests</artifactId>
-        <version>5.8.0-m2-SNAPSHOT</version>
+        <version>5.8.0-m2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/local-authenticators/pom.xml b/modules/local-authenticators/pom.xml
index c2ce9fb2f1..afe8e21952 100644
--- a/modules/local-authenticators/pom.xml
+++ b/modules/local-authenticators/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-server-parent</artifactId>
-        <version>5.8.0-m2-SNAPSHOT</version>
+        <version>5.8.0-m2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/migration/migration-service/pom.xml b/modules/migration/migration-service/pom.xml
index 9c157bbefe..86be038e5b 100644
--- a/modules/migration/migration-service/pom.xml
+++ b/modules/migration/migration-service/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-server-parent</artifactId>
-        <version>5.8.0-m2-SNAPSHOT</version>
+        <version>5.8.0-m2</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/oauth2-grant-types/pom.xml b/modules/oauth2-grant-types/pom.xml
index 6d0acc1169..ba97e576ae 100644
--- a/modules/oauth2-grant-types/pom.xml
+++ b/modules/oauth2-grant-types/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-server-parent</artifactId>
-        <version>5.8.0-m2-SNAPSHOT</version>
+        <version>5.8.0-m2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml
index 273d1ae012..437a47ef1e 100644
--- a/modules/p2-profile-gen/pom.xml
+++ b/modules/p2-profile-gen/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-server-parent</artifactId>
-        <version>5.8.0-m2-SNAPSHOT</version>
+        <version>5.8.0-m2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/provisioning-connectors/pom.xml b/modules/provisioning-connectors/pom.xml
index 213b779be9..45bbc13305 100644
--- a/modules/provisioning-connectors/pom.xml
+++ b/modules/provisioning-connectors/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-server-parent</artifactId>
-        <version>5.8.0-m2-SNAPSHOT</version>
+        <version>5.8.0-m2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/samples/authenticators/components/org.wso2.carbon.identity.sample.extension.auth.endpoint/pom.xml b/modules/samples/authenticators/components/org.wso2.carbon.identity.sample.extension.auth.endpoint/pom.xml
index 201d7ff74f..cf3b7d094d 100644
--- a/modules/samples/authenticators/components/org.wso2.carbon.identity.sample.extension.auth.endpoint/pom.xml
+++ b/modules/samples/authenticators/components/org.wso2.carbon.identity.sample.extension.auth.endpoint/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>wso2is-identity-samples-authenticators</artifactId>
-        <version>5.8.0-m2-SNAPSHOT</version>
+        <version>5.8.0-m2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/authenticators/components/org.wso2.carbon.identity.sample.extension.authenticators/pom.xml b/modules/samples/authenticators/components/org.wso2.carbon.identity.sample.extension.authenticators/pom.xml
index 20c4377016..e48181c21c 100644
--- a/modules/samples/authenticators/components/org.wso2.carbon.identity.sample.extension.authenticators/pom.xml
+++ b/modules/samples/authenticators/components/org.wso2.carbon.identity.sample.extension.authenticators/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>wso2is-identity-samples-authenticators</artifactId>
-        <version>5.8.0-m2-SNAPSHOT</version>
+        <version>5.8.0-m2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/authenticators/pom.xml b/modules/samples/authenticators/pom.xml
index c6fcea6cde..6cb289f40c 100644
--- a/modules/samples/authenticators/pom.xml
+++ b/modules/samples/authenticators/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>wso2is-identity-samples</artifactId>
-        <version>5.8.0-m2-SNAPSHOT</version>
+        <version>5.8.0-m2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/identity-mgt/info-recovery-sample/pom.xml b/modules/samples/identity-mgt/info-recovery-sample/pom.xml
index 7cfe31c3f7..1838c828ca 100644
--- a/modules/samples/identity-mgt/info-recovery-sample/pom.xml
+++ b/modules/samples/identity-mgt/info-recovery-sample/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>wso2is-identity-samples-info-recovery</artifactId>
-        <version>5.8.0-m2-SNAPSHOT</version>
+        <version>5.8.0-m2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/samples/identity-mgt/pom.xml b/modules/samples/identity-mgt/pom.xml
index 981813669d..8ce7770a7d 100644
--- a/modules/samples/identity-mgt/pom.xml
+++ b/modules/samples/identity-mgt/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>wso2is-identity-samples</artifactId>
-        <version>5.8.0-m2-SNAPSHOT</version>
+        <version>5.8.0-m2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/microprofile/microprofile-jwt/pom.xml b/modules/samples/microprofile/microprofile-jwt/pom.xml
index 1769f228d6..daf23730da 100644
--- a/modules/samples/microprofile/microprofile-jwt/pom.xml
+++ b/modules/samples/microprofile/microprofile-jwt/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>wso2is-identity-samples-microprofile</artifactId>
-        <version>5.8.0-m2-SNAPSHOT</version>
+        <version>5.8.0-m2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/modules/samples/microprofile/pom.xml b/modules/samples/microprofile/pom.xml
index 2f79d82dc1..96871805ad 100644
--- a/modules/samples/microprofile/pom.xml
+++ b/modules/samples/microprofile/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>wso2is-identity-samples</artifactId>
-        <version>5.8.0-m2-SNAPSHOT</version>
+        <version>5.8.0-m2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/modules/samples/oauth/oauth10a-resource-owner-equivalent/pom.xml b/modules/samples/oauth/oauth10a-resource-owner-equivalent/pom.xml
index feb67b349a..3da6b91409 100644
--- a/modules/samples/oauth/oauth10a-resource-owner-equivalent/pom.xml
+++ b/modules/samples/oauth/oauth10a-resource-owner-equivalent/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>wso2is-identity-samples-oauth10a</artifactId>
-        <version>5.8.0-m2-SNAPSHOT</version>
+        <version>5.8.0-m2</version>
     </parent>
 
 	<modelVersion>4.0.0</modelVersion>
diff --git a/modules/samples/oauth/pom.xml b/modules/samples/oauth/pom.xml
index ffccb7beae..b21da18767 100644
--- a/modules/samples/oauth/pom.xml
+++ b/modules/samples/oauth/pom.xml
@@ -20,7 +20,7 @@
     <parent>
     	<groupId>org.wso2.is</groupId>
     	<artifactId>wso2is-identity-samples</artifactId>
-    	<version>5.8.0-m2-SNAPSHOT</version>
+    	<version>5.8.0-m2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/oauth2/custom-grant/pom.xml b/modules/samples/oauth2/custom-grant/pom.xml
index ec298b4575..4e9c92e215 100644
--- a/modules/samples/oauth2/custom-grant/pom.xml
+++ b/modules/samples/oauth2/custom-grant/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>wso2is-identity-samples-oauth2</artifactId>
-        <version>5.8.0-m2-SNAPSHOT</version>
+        <version>5.8.0-m2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/oauth2/playground2/pom.xml b/modules/samples/oauth2/playground2/pom.xml
index f8be687fa4..4806a6c24f 100755
--- a/modules/samples/oauth2/playground2/pom.xml
+++ b/modules/samples/oauth2/playground2/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>wso2is-identity-samples-oauth2</artifactId>
-        <version>5.8.0-m2-SNAPSHOT</version>
+        <version>5.8.0-m2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/oauth2/pom.xml b/modules/samples/oauth2/pom.xml
index b3846324df..077e56b973 100644
--- a/modules/samples/oauth2/pom.xml
+++ b/modules/samples/oauth2/pom.xml
@@ -20,7 +20,7 @@
     <parent>
     	<groupId>org.wso2.is</groupId>
     	<artifactId>wso2is-identity-samples</artifactId>
-    	<version>5.8.0-m2-SNAPSHOT</version>
+    	<version>5.8.0-m2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/passive-sts/passive-sts-client/PassiveSTSFilter/pom.xml b/modules/samples/passive-sts/passive-sts-client/PassiveSTSFilter/pom.xml
index 3acf7cca46..47fb13c645 100644
--- a/modules/samples/passive-sts/passive-sts-client/PassiveSTSFilter/pom.xml
+++ b/modules/samples/passive-sts/passive-sts-client/PassiveSTSFilter/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>PassiveSTSSample</artifactId>
-        <version>5.8.0-m2-SNAPSHOT</version>
+        <version>5.8.0-m2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/passive-sts/passive-sts-client/PassiveSTSSampleApp/pom.xml b/modules/samples/passive-sts/passive-sts-client/PassiveSTSSampleApp/pom.xml
index 59da0cf98a..89a2aa6efb 100644
--- a/modules/samples/passive-sts/passive-sts-client/PassiveSTSSampleApp/pom.xml
+++ b/modules/samples/passive-sts/passive-sts-client/PassiveSTSSampleApp/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>PassiveSTSSample</artifactId>
-        <version>5.8.0-m2-SNAPSHOT</version>
+        <version>5.8.0-m2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/passive-sts/passive-sts-client/pom.xml b/modules/samples/passive-sts/passive-sts-client/pom.xml
index f67b1ee46b..0803c1eaa2 100644
--- a/modules/samples/passive-sts/passive-sts-client/pom.xml
+++ b/modules/samples/passive-sts/passive-sts-client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>wso2is-identity-samples-passivests</artifactId>
-        <version>5.8.0-m2-SNAPSHOT</version>
+        <version>5.8.0-m2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/passive-sts/pom.xml b/modules/samples/passive-sts/pom.xml
index 12695f2e80..ecc3445958 100644
--- a/modules/samples/passive-sts/pom.xml
+++ b/modules/samples/passive-sts/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>wso2is-identity-samples</artifactId>
-        <version>5.8.0-m2-SNAPSHOT</version>
+        <version>5.8.0-m2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml
index 6cd2c8b5f6..75dbb79208 100644
--- a/modules/samples/pom.xml
+++ b/modules/samples/pom.xml
@@ -20,7 +20,7 @@
     <parent>
     	<groupId>org.wso2.is</groupId>
     	<artifactId>identity-server-parent</artifactId>
-    	<version>5.8.0-m2-SNAPSHOT</version>
+    	<version>5.8.0-m2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/scim/pom.xml b/modules/samples/scim/pom.xml
index 0632038c67..8630adf2ce 100644
--- a/modules/samples/scim/pom.xml
+++ b/modules/samples/scim/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>wso2is-identity-samples</artifactId>
-        <version>5.8.0-m2-SNAPSHOT</version>
+        <version>5.8.0-m2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/scim/scim-provisioning/pom.xml b/modules/samples/scim/scim-provisioning/pom.xml
index bbf5cb3fd3..700d6972dc 100644
--- a/modules/samples/scim/scim-provisioning/pom.xml
+++ b/modules/samples/scim/scim-provisioning/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>wso2is-identity-samples-scim</artifactId>
-        <version>5.8.0-m2-SNAPSHOT</version>
+        <version>5.8.0-m2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/samples/sso/pom.xml b/modules/samples/sso/pom.xml
index 8c5faaa36e..4f0bbdac2a 100644
--- a/modules/samples/sso/pom.xml
+++ b/modules/samples/sso/pom.xml
@@ -21,7 +21,7 @@
         <groupId>org.wso2.is</groupId>
         <artifactId>wso2is-identity-samples</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>5.8.0-m2-SNAPSHOT</version>
+        <version>5.8.0-m2</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/samples/sso/sso-agent-sample/pom.xml b/modules/samples/sso/sso-agent-sample/pom.xml
index 2f97288b6a..2f7e6572f2 100644
--- a/modules/samples/sso/sso-agent-sample/pom.xml
+++ b/modules/samples/sso/sso-agent-sample/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>wso2is-identity-samples-sso</artifactId>
-        <version>5.8.0-m2-SNAPSHOT</version>
+        <version>5.8.0-m2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/sts/pom.xml b/modules/samples/sts/pom.xml
index 8876b1c353..143e8e6a40 100644
--- a/modules/samples/sts/pom.xml
+++ b/modules/samples/sts/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>wso2is-identity-samples</artifactId>
-        <version>5.8.0-m2-SNAPSHOT</version>
+        <version>5.8.0-m2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/sts/sts-client/pom.xml b/modules/samples/sts/sts-client/pom.xml
index 8a5c2498fc..13ee70926e 100644
--- a/modules/samples/sts/sts-client/pom.xml
+++ b/modules/samples/sts/sts-client/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>wso2is-identity-samples-sts</artifactId>
-        <version>5.8.0-m2-SNAPSHOT</version>
+        <version>5.8.0-m2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/user-mgt/pom.xml b/modules/samples/user-mgt/pom.xml
index e6d00063bd..814541fa75 100644
--- a/modules/samples/user-mgt/pom.xml
+++ b/modules/samples/user-mgt/pom.xml
@@ -20,7 +20,7 @@
     <parent>
     	<groupId>org.wso2.is</groupId>
     	<artifactId>wso2is-identity-samples</artifactId>
-    	<version>5.8.0-m2-SNAPSHOT</version>
+    	<version>5.8.0-m2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/user-mgt/remote-user-mgt/pom.xml b/modules/samples/user-mgt/remote-user-mgt/pom.xml
index 3bbec08fa8..10cc611615 100644
--- a/modules/samples/user-mgt/remote-user-mgt/pom.xml
+++ b/modules/samples/user-mgt/remote-user-mgt/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>wso2is-identity-samples-usermgt</artifactId>
-        <version>5.8.0-m2-SNAPSHOT</version>
+        <version>5.8.0-m2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/workflow/handler/service-provider/pom.xml b/modules/samples/workflow/handler/service-provider/pom.xml
index cb6f7347ef..38eef1bde7 100644
--- a/modules/samples/workflow/handler/service-provider/pom.xml
+++ b/modules/samples/workflow/handler/service-provider/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>wso2is-workflow-samples</artifactId>
-        <version>5.8.0-m2-SNAPSHOT</version>
+        <version>5.8.0-m2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/samples/workflow/pom.xml b/modules/samples/workflow/pom.xml
index e38bcee266..9e846aa903 100644
--- a/modules/samples/workflow/pom.xml
+++ b/modules/samples/workflow/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>wso2is-identity-samples</artifactId>
-        <version>5.8.0-m2-SNAPSHOT</version>
+        <version>5.8.0-m2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/workflow/template/sample-template/pom.xml b/modules/samples/workflow/template/sample-template/pom.xml
index cd8562793e..988dc3f0e4 100644
--- a/modules/samples/workflow/template/sample-template/pom.xml
+++ b/modules/samples/workflow/template/sample-template/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>wso2is-workflow-samples</artifactId>
-        <version>5.8.0-m2-SNAPSHOT</version>
+        <version>5.8.0-m2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/samples/xacml/kmarket-trading-sample/pom.xml b/modules/samples/xacml/kmarket-trading-sample/pom.xml
index 1f9a0055e6..d4306c2da7 100644
--- a/modules/samples/xacml/kmarket-trading-sample/pom.xml
+++ b/modules/samples/xacml/kmarket-trading-sample/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>wso2is-identity-samples-xacml</artifactId>
-        <version>5.8.0-m2-SNAPSHOT</version>
+        <version>5.8.0-m2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/xacml/pom.xml b/modules/samples/xacml/pom.xml
index 94fb556270..a01221032f 100644
--- a/modules/samples/xacml/pom.xml
+++ b/modules/samples/xacml/pom.xml
@@ -20,7 +20,7 @@
     <parent>
     	<groupId>org.wso2.is</groupId>
     	<artifactId>wso2is-identity-samples</artifactId>
-    	<version>5.8.0-m2-SNAPSHOT</version>
+    	<version>5.8.0-m2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/social-authenticators/pom.xml b/modules/social-authenticators/pom.xml
index 56470615e5..508c2fd483 100644
--- a/modules/social-authenticators/pom.xml
+++ b/modules/social-authenticators/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-server-parent</artifactId>
-        <version>5.8.0-m2-SNAPSHOT</version>
+        <version>5.8.0-m2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/styles/pom.xml b/modules/styles/pom.xml
index e7154db9d0..aaf376969b 100644
--- a/modules/styles/pom.xml
+++ b/modules/styles/pom.xml
@@ -20,7 +20,7 @@
     <parent>
     	<groupId>org.wso2.is</groupId>
     	<artifactId>identity-server-parent</artifactId>
-    	<version>5.8.0-m2-SNAPSHOT</version>
+    	<version>5.8.0-m2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/styles/product/pom.xml b/modules/styles/product/pom.xml
index 4536e9d1a0..90dac0c64e 100644
--- a/modules/styles/product/pom.xml
+++ b/modules/styles/product/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
     	<artifactId>identity-server-styles-parent</artifactId>
-        <version>5.8.0-m2-SNAPSHOT</version>
+        <version>5.8.0-m2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index 251f8ed0dc..0d5af11234 100755
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
     <artifactId>identity-server-parent</artifactId>
     <packaging>pom</packaging>
     <description>WSO2 Identity Server</description>
-    <version>5.8.0-m2-SNAPSHOT</version>
+    <version>5.8.0-m2</version>
     <name>WSO2 Identity Server</name>
     <url>http://wso2.org/projects/identity</url>
 
@@ -2002,7 +2002,7 @@
         <url>https://github.com/wso2/product-is.git</url>
         <developerConnection>scm:git:https://github.com/wso2/product-is.git</developerConnection>
         <connection>scm:git:https://github.com/wso2/product-is.git</connection>
-        <tag>HEAD</tag>
+        <tag>v5.8.0-m2</tag>
     </scm>