diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml
index 1f3ae282cf1..217c07bf683 100644
--- a/modules/p2-profile-gen/pom.xml
+++ b/modules/p2-profile-gen/pom.xml
@@ -263,6 +263,9 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.extension.identity.authenticator.outbound.emailotp:org.wso2.carbon.identity.authenticator.emailotp.feature:${authenticator.emailotp.version}
                                 </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.extension.identity.oauth.addons:org.wso2.carbon.identity.oauth2.token.handler.clientauth.jwt.feature:${identity.oauth.addons.version}
+                                </featureArtifactDef>
 
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity.user.ws:org.wso2.carbon.um.ws.service.feature:${identity.user.ws.version}
@@ -1102,6 +1105,10 @@
                                     <id>org.wso2.carbon.identity.authenticator.emailotp.feature.group</id>
                                     <version>${authenticator.emailotp.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.oauth2.token.handler.clientauth.jwt.feature.group</id>
+                                    <version>${identity.oauth.addons.version}</version>
+                                </feature>
 
                                 <feature>
                                     <id>org.wso2.carbon.identity.application.authenticator.oidc.server.feature.group</id>
@@ -1673,6 +1680,10 @@
                                     <id>org.wso2.carbon.identity.authenticator.emailotp.feature.group</id>
                                     <version>${authenticator.emailotp.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.oauth2.token.handler.clientauth.jwt.feature.group</id>
+                                    <version>${identity.oauth.addons.version}</version>
+                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.extension.identity.verification.provider.feature.group</id>
                                     <version>${identity.verification.version}</version>
@@ -2148,6 +2159,10 @@
                                     <id>org.wso2.carbon.identity.authenticator.emailotp.feature.group</id>
                                     <version>${authenticator.emailotp.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.oauth2.token.handler.clientauth.jwt.feature.group</id>
+                                    <version>${identity.oauth.addons.version}</version>
+                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.extension.identity.verification.provider.feature.group</id>
                                     <version>${identity.verification.version}</version>
diff --git a/pom.xml b/pom.xml
index 8c6725b8fa1..643052e8c54 100755
--- a/pom.xml
+++ b/pom.xml
@@ -2049,6 +2049,12 @@
                 <artifactId>org.wso2.carbon.extension.identity.verification.ui</artifactId>
                 <version>${identity.verification.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.extension.identity.oauth.addons</groupId>
+                <artifactId>org.wso2.carbon.identity.oauth2.token.handler.clientauth.jwt</artifactId>
+                <version>${identity.oauth.addons.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.wso2.msf4j</groupId>
                 <artifactId>msf4j-core</artifactId>
@@ -2292,7 +2298,7 @@
     <properties>
 
         <!--Carbon Identity Framework Version-->
-        <carbon.identity.framework.version>5.25.361</carbon.identity.framework.version>
+        <carbon.identity.framework.version>5.25.364</carbon.identity.framework.version>
         <carbon.identity.framework.version.range>[5.14.67, 6.0.0]</carbon.identity.framework.version.range>
 
         <!--SAML Common Utils Version-->