diff --git a/component/client-handler/pom.xml b/component/client-handler/pom.xml
index 7ad548c9..d511fae4 100644
--- a/component/client-handler/pom.xml
+++ b/component/client-handler/pom.xml
@@ -20,11 +20,11 @@
     <packaging>bundle</packaging>
     <name>Private Key JWT client handler</name>
     <url>http://wso2.org</url>
-    <version>2.5.20</version>
+    <version>2.5.21-SNAPSHOT</version>
     <parent>
         <groupId>org.wso2.carbon.extension.identity.oauth.addons</groupId>
         <artifactId>identity-oauth2-extenstions</artifactId>
-        <version>2.5.20</version>
+        <version>2.5.21-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/component/org.wso2.carbon.identity.dpop/pom.xml b/component/org.wso2.carbon.identity.dpop/pom.xml
index 98b9c150..fc529ff6 100644
--- a/component/org.wso2.carbon.identity.dpop/pom.xml
+++ b/component/org.wso2.carbon.identity.dpop/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-oauth2-extenstions</artifactId>
         <groupId>org.wso2.carbon.extension.identity.oauth.addons</groupId>
-        <version>2.5.20</version>
+        <version>2.5.21-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/component/org.wso2.carbon.identity.oauth2.clientauth.privilegeduser/pom.xml b/component/org.wso2.carbon.identity.oauth2.clientauth.privilegeduser/pom.xml
index bb1210ef..4197c521 100644
--- a/component/org.wso2.carbon.identity.oauth2.clientauth.privilegeduser/pom.xml
+++ b/component/org.wso2.carbon.identity.oauth2.clientauth.privilegeduser/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.wso2.carbon.extension.identity.oauth.addons</groupId>
         <artifactId>identity-oauth2-extenstions</artifactId>
-        <version>2.5.20</version>
+        <version>2.5.21-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/component/org.wso2.carbon.identity.oauth2.token.handler.clientauth.mutualtls/pom.xml b/component/org.wso2.carbon.identity.oauth2.token.handler.clientauth.mutualtls/pom.xml
index cc394222..ccfdf889 100644
--- a/component/org.wso2.carbon.identity.oauth2.token.handler.clientauth.mutualtls/pom.xml
+++ b/component/org.wso2.carbon.identity.oauth2.token.handler.clientauth.mutualtls/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.carbon.extension.identity.oauth.addons</groupId>
         <artifactId>identity-oauth2-extenstions</artifactId>
-        <version>2.5.20</version>
+        <version>2.5.21-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/component/org.wso2.carbon.identity.oauth2.token.handler.clientauth.tlswithidsecret/pom.xml b/component/org.wso2.carbon.identity.oauth2.token.handler.clientauth.tlswithidsecret/pom.xml
index 9456b441..2c475ec7 100644
--- a/component/org.wso2.carbon.identity.oauth2.token.handler.clientauth.tlswithidsecret/pom.xml
+++ b/component/org.wso2.carbon.identity.oauth2.token.handler.clientauth.tlswithidsecret/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-oauth2-extenstions</artifactId>
         <groupId>org.wso2.carbon.extension.identity.oauth.addons</groupId>
-        <version>2.5.20</version>
+        <version>2.5.21-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/component/org.wso2.carbon.identity.oauth2.validators.xacml/pom.xml b/component/org.wso2.carbon.identity.oauth2.validators.xacml/pom.xml
index 04d25c9a..ace5efef 100644
--- a/component/org.wso2.carbon.identity.oauth2.validators.xacml/pom.xml
+++ b/component/org.wso2.carbon.identity.oauth2.validators.xacml/pom.xml
@@ -24,13 +24,13 @@
     <parent>
         <groupId>org.wso2.carbon.extension.identity.oauth.addons</groupId>
         <artifactId>identity-oauth2-extenstions</artifactId>
-        <version>2.5.20</version>
+        <version>2.5.21-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.oauth2.validators.xacml</artifactId>
     <packaging>bundle</packaging>
-    <version>2.5.20</version>
+    <version>2.5.21-SNAPSHOT</version>
     <name>Identity Component - XACML based scope validator for OAuth access token</name>
     <description>XACML based scope validator for OAuth access token</description>
     <url>http://wso2.org</url>
diff --git a/features/org.wso2.carbon.identity.oauth2.token.handler.clientauth.jwt.feature/pom.xml b/features/org.wso2.carbon.identity.oauth2.token.handler.clientauth.jwt.feature/pom.xml
index 7bed9362..465345d8 100644
--- a/features/org.wso2.carbon.identity.oauth2.token.handler.clientauth.jwt.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth2.token.handler.clientauth.jwt.feature/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.extension.identity.oauth.addons</groupId>
         <artifactId>identity-oauth2-extenstions</artifactId>
-        <version>2.5.20</version>
+        <version>2.5.21-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -30,7 +30,7 @@
     <name>WSO2 Carbon Extension- Identity Oauth Extensions Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains extension feature for JWT Grant Type</description>
-    <version>2.5.20</version>
+    <version>2.5.21-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
diff --git a/features/org.wso2.carbon.identity.oauth2.validators.xacml.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth2.validators.xacml.server.feature/pom.xml
index 7c88ba40..23fe8d2e 100644
--- a/features/org.wso2.carbon.identity.oauth2.validators.xacml.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth2.validators.xacml.server.feature/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.wso2.carbon.extension.identity.oauth.addons</groupId>
         <artifactId>identity-oauth2-extenstions</artifactId>
-        <version>2.5.20</version>
+        <version>2.5.21-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index 3d99e4ae..24195351 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
     </parent>
     <groupId>org.wso2.carbon.extension.identity.oauth.addons</groupId>
     <artifactId>identity-oauth2-extenstions</artifactId>
-    <version>2.5.20</version>
+    <version>2.5.21-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon Extension - Identity OAuth Extensions Pom</name>
     <url>http://wso2.org</url>
@@ -77,7 +77,7 @@
         <connection>scm:git:https://github.com/wso2-extensions/identity-oauth-addons.git</connection>
         <url>https://github.com/wso2-extensions/identity-oauth-addons.git</url>
         <developerConnection>scm:git:https://github.com/wso2-extensions/identity-oauth-addons.git</developerConnection>
-        <tag>v2.5.20</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <dependencyManagement>