diff --git a/modules/authenticators/pom.xml b/modules/authenticators/pom.xml
index 5ff2c72a3d..f2f69967cc 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.4.0-SNAPSHOT</version>
+        <version>5.4.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 a4cfe0bb92..75b9e58e6b 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.4.0-SNAPSHOT</version>
+        <version>5.4.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 da4d4f1742..35d2946732 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.4.0-SNAPSHOT</version>
+        <version>5.4.0-m2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -114,14 +114,14 @@
 
                                 <property name="sso-idp-config-default" value="&lt;!--ServiceProvider&gt;&lt;/ServiceProvider--&gt;" />
 
-                                <property name="sso-idp-config-replace" value="&lt;ServiceProvider&gt;${line.separator} &lt;Issuer&gt;wso2.my.dashboard&lt;/Issuer&gt;${line.separator} &lt;AssertionConsumerServiceURLs&gt;${line.separator} &lt;AssertionConsumerServiceURL&gt;${carbon.protocol}://${carbon.host}:${carbon.management.port}/dashboard/acs&lt;/AssertionConsumerServiceURL&gt;${line.separator} &lt;/AssertionConsumerServiceURLs&gt;${line.separator} &lt;DefaultAssertionConsumerServiceURL&gt;${carbon.protocol}://${carbon.host}:${carbon.management.port}/dashboard/acs&lt;/DefaultAssertionConsumerServiceURL&gt;${line.separator} &lt;SignResponse&gt;true&lt;/SignResponse&gt;${line.separator} &lt;EnableAudienceRestriction&gt;true&lt;/EnableAudienceRestriction&gt;${line.separator} &lt;AudiencesList&gt;${line.separator} &lt;Audience&gt;carbonServer&lt;/Audience&gt;${line.separator}      &lt;/AudiencesList&gt;${line.separator}    &lt;/ServiceProvider&gt;" />
+                                <property name="sso-idp-config-replace" value="&lt;ServiceProvider&gt;${line.separator} &lt;Issuer&gt;wso2.my.dashboard&lt;/Issuer&gt;${line.separator} &lt;AssertionConsumerServiceURLs&gt;${line.separator} &lt;AssertionConsumerServiceURL&gt;${carbon.protocol}://${carbon.host}:${carbon.management.port}/dashboard/acs&lt;/AssertionConsumerServiceURL&gt;${line.separator} &lt;/AssertionConsumerServiceURLs&gt;${line.separator} &lt;DefaultAssertionConsumerServiceURL&gt;${carbon.protocol}://${carbon.host}:${carbon.management.port}/dashboard/acs&lt;/DefaultAssertionConsumerServiceURL&gt;${line.separator} &lt;SignResponse&gt;true&lt;/SignResponse&gt;${line.separator} &lt;EnableAudienceRestriction&gt;true&lt;/EnableAudienceRestriction&gt;${line.separator} &lt;AudiencesList&gt;${line.separator} &lt;Audience&gt;carbonServer&lt;/Audience&gt;${line.separator} &lt;/AudiencesList&gt;${line.separator}    &lt;/ServiceProvider&gt;" />
 
-                                <property name="security-header-filter-is-token" value="&lt;filter&gt;${line.separator} &lt;filter-name&gt;HttpHeaderSecurityFilter&lt;/filter-name&gt;${line.separator} &lt;filter-class&gt;org.apache.catalina.filters.HttpHeaderSecurityFilter&lt;/filter-class&gt;${line.separator} &lt;init-param&gt;${line.separator} &lt;param-name&gt;hstsEnabled&lt;/param-name&gt;${line.separator} &lt;param-value&gt;false&lt;/param-value&gt;${line.separator} &lt;/init-param&gt;${line.separator} &lt;init-param&gt;${line.separator}        &lt;param-name&gt;antiClickJackingEnabled&lt;/param-name&gt;${line.separator}        &lt;param-value&gt;false&lt;/param-value&gt;${line.separator}      &lt;/init-param&gt;${line.separator}    &lt;/filter&gt;${line.separator}${line.separator}    &lt;filter&gt;${line.separator}      &lt;filter-name&gt;HttpHeaderSecurityFilter_EnableAntiClickJacking&lt;/filter-name&gt;${line.separator}      &lt;filter-class&gt;org.apache.catalina.filters.HttpHeaderSecurityFilter&lt;/filter-class&gt;${line.separator}      &lt;init-param&gt;${line.separator}        &lt;param-name&gt;hstsEnabled&lt;/param-name&gt;${line.separator}        &lt;param-value&gt;false&lt;/param-value&gt;${line.separator}      &lt;/init-param&gt;${line.separator}      &lt;init-param&gt;${line.separator}        &lt;param-name&gt;blockContentTypeSniffingEnabled&lt;/param-name&gt;${line.separator}        &lt;param-value&gt;false&lt;/param-value&gt;${line.separator}      &lt;/init-param&gt;${line.separator}      &lt;init-param&gt;${line.separator}        &lt;param-name&gt;xssProtectionEnabled&lt;/param-name&gt;${line.separator}        &lt;param-value&gt;false&lt;/param-value&gt;${line.separator}      &lt;/init-param&gt;${line.separator}    &lt;/filter&gt;" />
+                                <property name="security-header-filter-is-token" value="&lt;filter&gt;${line.separator} &lt;filter-name&gt;HttpHeaderSecurityFilter&lt;/filter-name&gt;${line.separator} &lt;filter-class&gt;org.apache.catalina.filters.HttpHeaderSecurityFilter&lt;/filter-class&gt;${line.separator} &lt;init-param&gt;${line.separator} &lt;param-name&gt;hstsEnabled&lt;/param-name&gt;${line.separator} &lt;param-value&gt;false&lt;/param-value&gt;${line.separator} &lt;/init-param&gt;${line.separator} &lt;init-param&gt;${line.separator} &lt;param-name&gt;antiClickJackingEnabled&lt;/param-name&gt;${line.separator}        &lt;param-value&gt;false&lt;/param-value&gt;${line.separator}      &lt;/init-param&gt;${line.separator}    &lt;/filter&gt;${line.separator}${line.separator}    &lt;filter&gt;${line.separator}      &lt;filter-name&gt;HttpHeaderSecurityFilter_EnableAntiClickJacking&lt;/filter-name&gt;${line.separator}      &lt;filter-class&gt;org.apache.catalina.filters.HttpHeaderSecurityFilter&lt;/filter-class&gt;${line.separator}      &lt;init-param&gt;${line.separator}        &lt;param-name&gt;hstsEnabled&lt;/param-name&gt;${line.separator}        &lt;param-value&gt;false&lt;/param-value&gt;${line.separator}      &lt;/init-param&gt;${line.separator}      &lt;init-param&gt;${line.separator}        &lt;param-name&gt;blockContentTypeSniffingEnabled&lt;/param-name&gt;${line.separator}        &lt;param-value&gt;false&lt;/param-value&gt;${line.separator}      &lt;/init-param&gt;${line.separator}      &lt;init-param&gt;${line.separator}        &lt;param-name&gt;xssProtectionEnabled&lt;/param-name&gt;${line.separator}        &lt;param-value&gt;false&lt;/param-value&gt;${line.separator}      &lt;/init-param&gt;${line.separator}    &lt;/filter&gt;" />
 
-                                <property name="security-header-filter-mapping-is-token" value="&lt;filter-mapping&gt;${line.separator} &lt;filter-name&gt;HttpHeaderSecurityFilter&lt;/filter-name&gt;${line.separator} &lt;url-pattern&gt;*&lt;/url-pattern&gt;${line.separator} &lt;/filter-mapping&gt;${line.separator}${line.separator} &lt;filter-mapping&gt;${line.separator} &lt;filter-name&gt;CharsetFilter&lt;/filter-name&gt;${line.separator} &lt;url-pattern&gt;/*&lt;/url-pattern&gt;${line.separator} &lt;/filter-mapping&gt;${line.separator}${line.separator} &lt;filter-mapping&gt;${line.separator}     &lt;filter-name&gt;HttpHeaderSecurityFilter_EnableAntiClickJacking&lt;/filter-name&gt;${line.separator}      &lt;url-pattern&gt;/carbon/*&lt;/url-pattern&gt;${line.separator}      &lt;url-pattern&gt;/services/*&lt;/url-pattern&gt;${line.separator}      &lt;url-pattern&gt;/samlsso/*&lt;/url-pattern&gt;${line.separator}      &lt;url-pattern&gt;/openid/*&lt;/url-pattern&gt;${line.separator}      &lt;url-pattern&gt;/openidserver/*&lt;/url-pattern&gt;${line.separator}      &lt;url-pattern&gt;/passivests/*&lt;/url-pattern&gt;${line.separator}      &lt;url-pattern&gt;/acs/*&lt;/url-pattern&gt;${line.separator}      &lt;url-pattern&gt;/iwa/*&lt;/url-pattern&gt;${line.separator}      &lt;url-pattern&gt;/identity/*&lt;/url-pattern&gt;${line.separator}      &lt;url-pattern&gt;/thriftAuthenticator/*&lt;/url-pattern&gt;${line.separator}    &lt;/filter-mapping&gt;${line.separator}" />
+                                <property name="security-header-filter-mapping-is-token" value="&lt;filter-mapping&gt;${line.separator} &lt;filter-name&gt;HttpHeaderSecurityFilter&lt;/filter-name&gt;${line.separator} &lt;url-pattern&gt;*&lt;/url-pattern&gt;${line.separator} &lt;/filter-mapping&gt;${line.separator}${line.separator} &lt;filter-mapping&gt;${line.separator} &lt;filter-name&gt;CharsetFilter&lt;/filter-name&gt;${line.separator} &lt;url-pattern&gt;/*&lt;/url-pattern&gt;${line.separator} &lt;/filter-mapping&gt;${line.separator}${line.separator} &lt;filter-mapping&gt;${line.separator} &lt;filter-name&gt;HttpHeaderSecurityFilter_EnableAntiClickJacking&lt;/filter-name&gt;${line.separator}      &lt;url-pattern&gt;/carbon/*&lt;/url-pattern&gt;${line.separator}      &lt;url-pattern&gt;/services/*&lt;/url-pattern&gt;${line.separator}      &lt;url-pattern&gt;/samlsso/*&lt;/url-pattern&gt;${line.separator}      &lt;url-pattern&gt;/openid/*&lt;/url-pattern&gt;${line.separator}      &lt;url-pattern&gt;/openidserver/*&lt;/url-pattern&gt;${line.separator}      &lt;url-pattern&gt;/passivests/*&lt;/url-pattern&gt;${line.separator}      &lt;url-pattern&gt;/acs/*&lt;/url-pattern&gt;${line.separator}      &lt;url-pattern&gt;/iwa/*&lt;/url-pattern&gt;${line.separator}      &lt;url-pattern&gt;/identity/*&lt;/url-pattern&gt;${line.separator}      &lt;url-pattern&gt;/thriftAuthenticator/*&lt;/url-pattern&gt;${line.separator}    &lt;/filter-mapping&gt;${line.separator}" />
                                 <property name="hideMenu" value="&lt;/Security&gt;${line.separator}&lt;HideMenuItemIds&gt;${line.separator}&lt;HideMenuItemId&gt;claim_mgt_menu&lt;/HideMenuItemId&gt;${line.separator}&lt;HideMenuItemId&gt;identity_mgt_emailtemplate_menu&lt;/HideMenuItemId&gt;${line.separator}&lt;HideMenuItemId&gt;identity_security_questions_menu&lt;/HideMenuItemId&gt;${line.separator}&lt;/HideMenuItemIds&gt;" />
 
-                                <property name="captcha-filter-is-token" value="&lt;filter&gt;${line.separator} &lt;filter-name&gt;CaptchaFilter&lt;/filter-name&gt;${line.separator} &lt;filter-class&gt;org.wso2.carbon.identity.captcha.filter.CaptchaFilter&lt;/filter-class&gt;${line.separator} &lt;/filter&gt;${line.separator}${line.separator} &lt;filter-mapping&gt;${line.separator}      &lt;filter-name&gt;CaptchaFilter&lt;/filter-name&gt;${line.separator}      &lt;url-pattern&gt;/samlsso&lt;/url-pattern&gt;${line.separator}      &lt;url-pattern&gt;/oauth2&lt;/url-pattern&gt;${line.separator}      &lt;url-pattern&gt;/commonauth&lt;/url-pattern&gt;${line.separator}      &lt;dispatcher&gt;FORWARD&lt;/dispatcher&gt;${line.separator}      &lt;dispatcher&gt;REQUEST&lt;/dispatcher&gt;${line.separator}    &lt;/filter-mapping&gt;${line.separator}${line.separator}    &lt;session-config&gt;" />
+                                <property name="captcha-filter-is-token" value="&lt;filter&gt;${line.separator} &lt;filter-name&gt;CaptchaFilter&lt;/filter-name&gt;${line.separator} &lt;filter-class&gt;org.wso2.carbon.identity.captcha.filter.CaptchaFilter&lt;/filter-class&gt;${line.separator} &lt;/filter&gt;${line.separator}${line.separator} &lt;filter-mapping&gt;${line.separator} &lt;filter-name&gt;CaptchaFilter&lt;/filter-name&gt;${line.separator}      &lt;url-pattern&gt;/samlsso&lt;/url-pattern&gt;${line.separator}      &lt;url-pattern&gt;/oauth2&lt;/url-pattern&gt;${line.separator}      &lt;url-pattern&gt;/commonauth&lt;/url-pattern&gt;${line.separator}      &lt;dispatcher&gt;FORWARD&lt;/dispatcher&gt;${line.separator}      &lt;dispatcher&gt;REQUEST&lt;/dispatcher&gt;${line.separator}    &lt;/filter-mapping&gt;${line.separator}${line.separator}    &lt;session-config&gt;" />
 
                                 <mkdir dir="${tempdir}" />
                                 <unzip dest="${tempdir}">
diff --git a/modules/features/org.wso2.identity.styles.feature/pom.xml b/modules/features/org.wso2.identity.styles.feature/pom.xml
index 573a8cee6e..3c235d10ca 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.4.0-SNAPSHOT</version>
+		<version>5.4.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 528e45d720..80a11402ba 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.4.0-SNAPSHOT</version>
+		<version>5.4.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 62f2885528..95e2a89060 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.4.0-SNAPSHOT</version>
+		<version>5.4.0-m2</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/modules/features/pom.xml b/modules/features/pom.xml
index c7d0328cd8..1b9c3e6a6b 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.4.0-SNAPSHOT</version>
+    	<version>5.4.0-m2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml
index 442ed7fa36..c918d48d5c 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.4.0-SNAPSHOT</version>
+        <version>5.4.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 1da122610c..f79ecc0020 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.4.0-SNAPSHOT</version>
+        <version>5.4.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 3083257328..1f7e20ddcf 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.4.0-SNAPSHOT</version>
+        <version>5.4.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 a701323e15..bf6157c386 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.4.0-SNAPSHOT</version>
+        <version>5.4.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 292f95e8d0..0d7b0f7f0e 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.4.0-SNAPSHOT</version>
+        <version>5.4.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 5f6d423b36..6c898ce406 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.4.0-SNAPSHOT</version>
+        <version>5.4.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 ec7ec650f8..b33077de8a 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.4.0-SNAPSHOT</version>
+        <version>5.4.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 553ab4ffe9..400f622096 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.4.0-SNAPSHOT</version>
+        <version>5.4.0-m2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/local-authenticators/pom.xml b/modules/local-authenticators/pom.xml
index bfbeb2f9fc..68a85cf767 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.4.0-SNAPSHOT</version>
+        <version>5.4.0-m2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/migration/migration-5.2.0_to_5.3.0/wso2-is-migration-client/pom.xml b/modules/migration/migration-5.2.0_to_5.3.0/wso2-is-migration-client/pom.xml
index 3ce35a1d96..2f3d4cf05a 100644
--- a/modules/migration/migration-5.2.0_to_5.3.0/wso2-is-migration-client/pom.xml
+++ b/modules/migration/migration-5.2.0_to_5.3.0/wso2-is-migration-client/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-server-parent</artifactId>
-        <version>5.4.0-SNAPSHOT</version>
+        <version>5.4.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 1da34f13a4..c8910707f2 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.4.0-SNAPSHOT</version>
+        <version>5.4.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 22a7d40f2c..cede0d5d94 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.4.0-SNAPSHOT</version>
+        <version>5.4.0-m2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/provisioning-connectors/pom.xml b/modules/provisioning-connectors/pom.xml
index 4718e2af19..625ecdae8c 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.4.0-SNAPSHOT</version>
+        <version>5.4.0-m2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/samples/identity-mgt/info-recovery-sample/pom.xml b/modules/samples/identity-mgt/info-recovery-sample/pom.xml
index af896f4b22..7d6d36b91d 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.4.0-SNAPSHOT</version>
+        <version>5.4.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 acd8eafa84..125f281c48 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.4.0-SNAPSHOT</version>
+        <version>5.4.0-m2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/oauth/oauth10a-resource-owner-equivalent/pom.xml b/modules/samples/oauth/oauth10a-resource-owner-equivalent/pom.xml
index 80b850c65e..48c3150012 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.4.0-SNAPSHOT</version>
+        <version>5.4.0-m2</version>
     </parent>
 
 	<modelVersion>4.0.0</modelVersion>
diff --git a/modules/samples/oauth/pom.xml b/modules/samples/oauth/pom.xml
index 683176c703..d6eace5c23 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.4.0-SNAPSHOT</version>
+    	<version>5.4.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 1df38356ab..3c98d76692 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.4.0-SNAPSHOT</version>
+        <version>5.4.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 cef6016e04..59ab80f8de 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.4.0-SNAPSHOT</version>
+        <version>5.4.0-m2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/oauth2/pom.xml b/modules/samples/oauth2/pom.xml
index a1a7ec3ba7..4f727626bd 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.4.0-SNAPSHOT</version>
+    	<version>5.4.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 1177d880a9..4397b2e05e 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.4.0-SNAPSHOT</version>
+        <version>5.4.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 3379f3008c..591e2cd551 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.4.0-SNAPSHOT</version>
+        <version>5.4.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 69f311d565..68c09fbaa4 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.4.0-SNAPSHOT</version>
+        <version>5.4.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 f8622e1b73..194e468d88 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.4.0-SNAPSHOT</version>
+        <version>5.4.0-m2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml
index cd7cacf728..7d2e7135e9 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.4.0-SNAPSHOT</version>
+    	<version>5.4.0-m2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/scim/pom.xml b/modules/samples/scim/pom.xml
index bf8189f479..8678b5cb95 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.4.0-SNAPSHOT</version>
+        <version>5.4.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 d9fff04cd6..862b7f4b2a 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.4.0-SNAPSHOT</version>
+        <version>5.4.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 a4adcdd820..2c6411f689 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.4.0-SNAPSHOT</version>
+        <version>5.4.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 d16d3897a7..0b690396d1 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.4.0-SNAPSHOT</version>
+        <version>5.4.0-m2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/sts/pom.xml b/modules/samples/sts/pom.xml
index 2737e7d1f3..28c1623597 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.4.0-SNAPSHOT</version>
+        <version>5.4.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 e0f4c6d086..3eb56e5daa 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.4.0-SNAPSHOT</version>
+        <version>5.4.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 58c2becece..0c8ea4a6ca 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.4.0-SNAPSHOT</version>
+    	<version>5.4.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 206f7fe30f..9b82353f8b 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.4.0-SNAPSHOT</version>
+        <version>5.4.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 f4067bf7ab..4057ca81f1 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.4.0-SNAPSHOT</version>
+        <version>5.4.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 8f4ab60b56..24dd4c8c65 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.4.0-SNAPSHOT</version>
+        <version>5.4.0-m2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/xacml/kmarket-trading-sample/pom.xml b/modules/samples/xacml/kmarket-trading-sample/pom.xml
index fc3bd11581..5b09e3e555 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.4.0-SNAPSHOT</version>
+        <version>5.4.0-m2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/xacml/pom.xml b/modules/samples/xacml/pom.xml
index 0bd1fdfef9..b6d3a201b4 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.4.0-SNAPSHOT</version>
+    	<version>5.4.0-m2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/social-authenticators/pom.xml b/modules/social-authenticators/pom.xml
index caca5de36c..a46f71074b 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.4.0-SNAPSHOT</version>
+        <version>5.4.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 47cdc27163..b29b5fbbf8 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.4.0-SNAPSHOT</version>
+    	<version>5.4.0-m2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/styles/product/pom.xml b/modules/styles/product/pom.xml
index 727b8d1472..b58a1075fe 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.4.0-SNAPSHOT</version>
+        <version>5.4.0-m2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index f0cc6d5b76..028ba5ede0 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.4.0-SNAPSHOT</version>
+    <version>5.4.0-m2</version>
     <name>WSO2 Identity Server</name>
     <url>http://wso2.org/projects/identity</url>
 
@@ -1742,7 +1742,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.4.0-m2</tag>
     </scm>