diff --git a/modules/authenticators/pom.xml b/modules/authenticators/pom.xml
index 4684758029c..347ff37fa75 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-m26-SNAPSHOT</version>
+        <version>5.8.0-m26</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/connectors/pom.xml b/modules/connectors/pom.xml
index 3ddce5d7b69..7856b42e892 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-m26-SNAPSHOT</version>
+        <version>5.8.0-m26</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 947e6289b4d..9954726ced3 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-m26-SNAPSHOT</version>
+        <version>5.8.0-m26</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -191,11 +191,9 @@
 
                                 <replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml" token="&lt;ForceLocalCache&gt;false&lt;/ForceLocalCache&gt;" value="&lt;ForceLocalCache&gt;true&lt;/ForceLocalCache&gt;" />
 
-                                <replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml" token="&lt;!--${line.separator}            Uncomment the following configuration to use hardware security module for cryptographic operations.${line.separator}            Provide configurations as detailed in each tag.${line.separator}        --&gt;" value=" "/>
+                                <replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml" token="&lt;!--${line.separator} Uncomment the following configuration to use hardware security module for cryptographic operations.${line.separator}            Provide configurations as detailed in each tag.${line.separator}        --&gt;" value=" " />
 
-                                <replaceregexp file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml"
-                                               match="^(\s)*&lt;\!--(\s)*&lt;HSMBasedCryptoProviderConfig&gt;[\s\S]*?&lt;\/HSMBasedCryptoProviderConfig&gt;(\s)*-->"
-                                               replace=" " flags="m"/>
+                                <replaceregexp file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml" match="^(\s)*&lt;\!--(\s)*&lt;HSMBasedCryptoProviderConfig&gt;[\s\S]*?&lt;\/HSMBasedCryptoProviderConfig&gt;(\s)*--&gt;" replace=" " flags="m" />
 
                                 <!-- Enable AskPassword Admin UI in product-is -->
                                 <replace file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/identity.xml" token="&lt;EnableAskPasswordAdminUI&gt;false&lt;/EnableAskPasswordAdminUI&gt;" value="&lt;EnableAskPasswordAdminUI&gt;true&lt;/EnableAskPasswordAdminUI&gt;" />
diff --git a/modules/features/org.wso2.identity.styles.feature/pom.xml b/modules/features/org.wso2.identity.styles.feature/pom.xml
index 63d20bed26e..b132480e317 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-m26-SNAPSHOT</version>
+		<version>5.8.0-m26</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 8b3b903ef74..d2c6e4765e1 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-m26-SNAPSHOT</version>
+		<version>5.8.0-m26</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 2e0be3cc7a4..a7fd4b05e77 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-m26-SNAPSHOT</version>
+		<version>5.8.0-m26</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/modules/features/pom.xml b/modules/features/pom.xml
index 7404af83d5f..2a827486254 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-m26-SNAPSHOT</version>
+    	<version>5.8.0-m26</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml
index 2bcd083f13d..f5ddad7c951 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-m26-SNAPSHOT</version>
+        <version>5.8.0-m26</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 ffae61a6196..bac6ce83ef6 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-m26-SNAPSHOT</version>
+        <version>5.8.0-m26</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 7dec47d525a..ff47bb7d5ce 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-m26-SNAPSHOT</version>
+        <version>5.8.0-m26</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 01009512bb4..814367eb36c 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-m26-SNAPSHOT</version>
+        <version>5.8.0-m26</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/tests-common/pom.xml b/modules/integration/tests-common/pom.xml
index 15634a608af..45c92e5ace9 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-m26-SNAPSHOT</version>
+        <version>5.8.0-m26</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 b2c06626a5f..64a4447d8e2 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-m26-SNAPSHOT</version>
+        <version>5.8.0-m26</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/tests-integration/pom.xml b/modules/integration/tests-integration/pom.xml
index dc3c442d65f..13a473b9799 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-m26-SNAPSHOT</version>
+        <version>5.8.0-m26</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 21d9c9e5cc8..1c9865d864e 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-m26-SNAPSHOT</version>
+        <version>5.8.0-m26</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/local-authenticators/pom.xml b/modules/local-authenticators/pom.xml
index 58cb6cfb76e..8f73139529e 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-m26-SNAPSHOT</version>
+        <version>5.8.0-m26</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 ec9106d393b..9f30e31002c 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-m26-SNAPSHOT</version>
+        <version>5.8.0-m26</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/oauth2-grant-types/pom.xml b/modules/oauth2-grant-types/pom.xml
index d58227c3cad..269f81f3eb7 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-m26-SNAPSHOT</version>
+        <version>5.8.0-m26</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml
index 085e9f2df9a..2070e8ed9b1 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-m26-SNAPSHOT</version>
+        <version>5.8.0-m26</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/provisioning-connectors/pom.xml b/modules/provisioning-connectors/pom.xml
index 82e0538b70b..1748e547e87 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-m26-SNAPSHOT</version>
+        <version>5.8.0-m26</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 0d7e4463fb4..f5e41f9f7c7 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-m26-SNAPSHOT</version>
+        <version>5.8.0-m26</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 c561649cc5a..2d18ad89411 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-m26-SNAPSHOT</version>
+        <version>5.8.0-m26</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/authenticators/pom.xml b/modules/samples/authenticators/pom.xml
index d5ddb5d4f91..4e391dc2042 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-m26-SNAPSHOT</version>
+        <version>5.8.0-m26</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 a989a6ca647..c1b84adac9d 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-m26-SNAPSHOT</version>
+        <version>5.8.0-m26</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 cd97bdf523a..21fb549aa43 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-m26-SNAPSHOT</version>
+        <version>5.8.0-m26</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 0e8021c7bb1..e7911732a24 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-m26-SNAPSHOT</version>
+        <version>5.8.0-m26</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/modules/samples/microprofile/pom.xml b/modules/samples/microprofile/pom.xml
index 30c4f4ee718..5edf7d5d1fd 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-m26-SNAPSHOT</version>
+        <version>5.8.0-m26</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 46552dabddd..5f975bdf54b 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-m26-SNAPSHOT</version>
+        <version>5.8.0-m26</version>
     </parent>
 
 	<modelVersion>4.0.0</modelVersion>
diff --git a/modules/samples/oauth/pom.xml b/modules/samples/oauth/pom.xml
index ebce08759e8..6ee4a599663 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-m26-SNAPSHOT</version>
+    	<version>5.8.0-m26</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 df49253f97e..bea05a14b72 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-m26-SNAPSHOT</version>
+        <version>5.8.0-m26</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/oauth2/playground2/pom.xml b/modules/samples/oauth2/playground2/pom.xml
index 6f31fa05870..b91581cb86c 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-m26-SNAPSHOT</version>
+        <version>5.8.0-m26</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/oauth2/pom.xml b/modules/samples/oauth2/pom.xml
index 66e19cef2fd..f1aed9a1254 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-m26-SNAPSHOT</version>
+    	<version>5.8.0-m26</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 04aa90d4d4d..48c9d625adc 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-m26-SNAPSHOT</version>
+        <version>5.8.0-m26</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 bd1bb65746b..a009b420d27 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-m26-SNAPSHOT</version>
+        <version>5.8.0-m26</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 b0659087b46..51f5928589f 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-m26-SNAPSHOT</version>
+        <version>5.8.0-m26</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/passive-sts/pom.xml b/modules/samples/passive-sts/pom.xml
index 655d0e96d19..0d21dca1f31 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-m26-SNAPSHOT</version>
+        <version>5.8.0-m26</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml
index 23b81f127ac..4cae3ab7791 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-m26-SNAPSHOT</version>
+    	<version>5.8.0-m26</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/scim/pom.xml b/modules/samples/scim/pom.xml
index b9dbdb745be..863a96ae0d4 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-m26-SNAPSHOT</version>
+        <version>5.8.0-m26</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 b5216d375e8..668879c9a67 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-m26-SNAPSHOT</version>
+        <version>5.8.0-m26</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 ff89c40bd8c..6bdc2f9aeea 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-m26-SNAPSHOT</version>
+        <version>5.8.0-m26</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 6f1c0e19793..36805885a04 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-m26-SNAPSHOT</version>
+        <version>5.8.0-m26</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/sts/pom.xml b/modules/samples/sts/pom.xml
index 092b1ad47bf..08a7b3b9ba2 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-m26-SNAPSHOT</version>
+        <version>5.8.0-m26</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 bfd31cbdfa4..5548ba1b9eb 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-m26-SNAPSHOT</version>
+        <version>5.8.0-m26</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/user-mgt/pom.xml b/modules/samples/user-mgt/pom.xml
index 398c613cbd9..395ddf03663 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-m26-SNAPSHOT</version>
+    	<version>5.8.0-m26</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 65b0d160c02..1fd1d2be072 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-m26-SNAPSHOT</version>
+        <version>5.8.0-m26</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 3a71d8a4984..74751b1a290 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-m26-SNAPSHOT</version>
+        <version>5.8.0-m26</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 fe007fb4f08..39d82a691f7 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-m26-SNAPSHOT</version>
+        <version>5.8.0-m26</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 42279f1f285..97c19791006 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-m26-SNAPSHOT</version>
+        <version>5.8.0-m26</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 f663c027b15..ea8c4c95c00 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-m26-SNAPSHOT</version>
+        <version>5.8.0-m26</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/xacml/pom.xml b/modules/samples/xacml/pom.xml
index 1b1b593fbf4..fe6ce143d56 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-m26-SNAPSHOT</version>
+    	<version>5.8.0-m26</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/social-authenticators/pom.xml b/modules/social-authenticators/pom.xml
index 2ea8a48b70e..c5b18be11f1 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-m26-SNAPSHOT</version>
+        <version>5.8.0-m26</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/styles/pom.xml b/modules/styles/pom.xml
index 8dcd4382c20..c399c792197 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-m26-SNAPSHOT</version>
+    	<version>5.8.0-m26</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/styles/product/pom.xml b/modules/styles/product/pom.xml
index 77a2365d5fd..547d5e6dbbd 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-m26-SNAPSHOT</version>
+        <version>5.8.0-m26</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index 0d1eee4c063..04b5dadcffd 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-m26-SNAPSHOT</version>
+    <version>5.8.0-m26</version>
     <name>WSO2 Identity Server</name>
     <url>http://wso2.org/projects/identity</url>
 
@@ -2044,7 +2044,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-m26</tag>
     </scm>