diff --git a/components/org.wso2.carbon.identity.query.saml/pom.xml b/components/org.wso2.carbon.identity.query.saml/pom.xml
index 46796c7ed..d9e1a4353 100644
--- a/components/org.wso2.carbon.identity.query.saml/pom.xml
+++ b/components/org.wso2.carbon.identity.query.saml/pom.xml
@@ -21,7 +21,7 @@
 		<groupId>org.wso2.carbon.identity.inbound.auth.saml2</groupId>
 		<artifactId>identity-inbound-auth-saml</artifactId>
 		<relativePath>../../pom.xml</relativePath>
-		<version>5.6.21-SNAPSHOT</version>
+		<version>5.6.21</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>org.wso2.carbon.identity.query.saml</artifactId>
diff --git a/components/org.wso2.carbon.identity.sso.saml.common/pom.xml b/components/org.wso2.carbon.identity.sso.saml.common/pom.xml
index e4b776e5a..fd8e43873 100644
--- a/components/org.wso2.carbon.identity.sso.saml.common/pom.xml
+++ b/components/org.wso2.carbon.identity.sso.saml.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.inbound.auth.saml2</groupId>
         <artifactId>identity-inbound-auth-saml</artifactId>
         <relativePath>../../pom.xml</relativePath>
-        <version>5.6.21-SNAPSHOT</version>
+        <version>5.6.21</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.sso.saml.stub/pom.xml b/components/org.wso2.carbon.identity.sso.saml.stub/pom.xml
index 05241d1da..11817f72a 100644
--- a/components/org.wso2.carbon.identity.sso.saml.stub/pom.xml
+++ b/components/org.wso2.carbon.identity.sso.saml.stub/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.inbound.auth.saml2</groupId>
         <artifactId>identity-inbound-auth-saml</artifactId>
         <relativePath>../../pom.xml</relativePath>
-        <version>5.6.21-SNAPSHOT</version>
+        <version>5.6.21</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.sso.saml.ui/pom.xml b/components/org.wso2.carbon.identity.sso.saml.ui/pom.xml
index 869ee3062..2c5d7f1a4 100644
--- a/components/org.wso2.carbon.identity.sso.saml.ui/pom.xml
+++ b/components/org.wso2.carbon.identity.sso.saml.ui/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.inbound.auth.saml2</groupId>
         <artifactId>identity-inbound-auth-saml</artifactId>
         <relativePath>../../pom.xml</relativePath>
-        <version>5.6.21-SNAPSHOT</version>
+        <version>5.6.21</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.sso.saml/pom.xml b/components/org.wso2.carbon.identity.sso.saml/pom.xml
index 617812403..a1807e5f6 100644
--- a/components/org.wso2.carbon.identity.sso.saml/pom.xml
+++ b/components/org.wso2.carbon.identity.sso.saml/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.inbound.auth.saml2</groupId>
         <artifactId>identity-inbound-auth-saml</artifactId>
         <relativePath>../../pom.xml</relativePath>
-        <version>5.6.21-SNAPSHOT</version>
+        <version>5.6.21</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.query.saml.server.feature/pom.xml b/features/org.wso2.carbon.identity.query.saml.server.feature/pom.xml
index 229de5939..0819918f6 100644
--- a/features/org.wso2.carbon.identity.query.saml.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.query.saml.server.feature/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.inbound.auth.saml2</groupId>
         <artifactId>identity-inbound-auth-saml</artifactId>
         <relativePath>../../pom.xml</relativePath>
-        <version>5.6.21-SNAPSHOT</version>
+        <version>5.6.21</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.sso.saml.feature/pom.xml b/features/org.wso2.carbon.identity.sso.saml.feature/pom.xml
index af2937377..bc195df7e 100644
--- a/features/org.wso2.carbon.identity.sso.saml.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.sso.saml.feature/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.inbound.auth.saml2</groupId>
         <artifactId>identity-inbound-auth-saml</artifactId>
         <relativePath>../../pom.xml</relativePath>
-        <version>5.6.21-SNAPSHOT</version>
+        <version>5.6.21</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.sso.saml.server.feature/pom.xml b/features/org.wso2.carbon.identity.sso.saml.server.feature/pom.xml
index 1b199c70f..8450d8a1b 100644
--- a/features/org.wso2.carbon.identity.sso.saml.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.sso.saml.server.feature/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.inbound.auth.saml2</groupId>
         <artifactId>identity-inbound-auth-saml</artifactId>
         <relativePath>../../pom.xml</relativePath>
-        <version>5.6.21-SNAPSHOT</version>
+        <version>5.6.21</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.sso.saml.ui.feature/pom.xml b/features/org.wso2.carbon.identity.sso.saml.ui.feature/pom.xml
index fa3a1255e..a5a4b7354 100644
--- a/features/org.wso2.carbon.identity.sso.saml.ui.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.sso.saml.ui.feature/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.inbound.auth.saml2</groupId>
         <artifactId>identity-inbound-auth-saml</artifactId>
         <relativePath>../../pom.xml</relativePath>
-        <version>5.6.21-SNAPSHOT</version>
+        <version>5.6.21</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 474afe23a..7ab1be797 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
     <groupId>org.wso2.carbon.identity.inbound.auth.saml2</groupId>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>identity-inbound-auth-saml</artifactId>
-    <version>5.6.21-SNAPSHOT</version>
+    <version>5.6.21</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon SAML SSO</name>
     <description>
@@ -40,7 +40,7 @@
         <developerConnection>scm:git:https://github.com/wso2-extensions/identity-inbound-auth-saml.git
         </developerConnection>
         <connection>scm:git:https://github.com/wso2-extensions/identity-inbound-auth-saml.git</connection>
-        <tag>HEAD</tag>
+        <tag>v5.6.21</tag>
     </scm>
 
     <dependencyManagement>