diff --git a/modules/analytics/distribution/src/ues/designer.json b/modules/analytics/distribution/src/ues/designer.json
index 35737370..16ea3cce 100644
--- a/modules/analytics/distribution/src/ues/designer.json
+++ b/modules/analytics/distribution/src/ues/designer.json
@@ -43,10 +43,11 @@
                             "password":"admin",
                             "dynamicClientAppRegistrationServiceURL": "https://localhost:9443/dynamic-client-web/register",
                             "apiManagerClientAppRegistrationServiceURL": "https://localhost:9443/api-application-registration/register/tenants",
-                            "grantType": "password refresh_token urn:ietf:params:oauth:grant-type:saml2-carbon urn:ietf:params:oauth:grant-type:jwt-bearer",
+                            "grantType": "password refresh_token urn:ietf:carbon:signed:grant-type:saml2-bearer urn:ietf:params:oauth:grant-type:jwt-bearer",
                             "tokenScope": "admin",
                             "callbackUrl": "https://localhost:9445/portal",
-                            "saasApp":true
+                            "saasApp":true,
+                            "samlGrantTypeName": "urn:ietf:carbon:signed:grant-type:saml2-bearer"
                         },
                         "tokenServiceURL": "https://localhost:9443/oauth2/token"
                     },
diff --git a/modules/core/distribution/identity_config_change.xml b/modules/core/distribution/identity_config_change.xml
index 27e2ded7..e24a54ef 100644
--- a/modules/core/distribution/identity_config_change.xml
+++ b/modules/core/distribution/identity_config_change.xml
@@ -33,7 +33,7 @@
 		<after>//s:Server/s:OAuth/s:SupportedGrantTypes/s:SupportedGrantType[s:GrantTypeName='iwa:ntlm']</after>
 		<value>
 			<![CDATA[<SupportedGrantType>
-		<GrantTypeName>urn:ietf:params:oauth:grant-type:saml2-carbon</GrantTypeName>
+		<GrantTypeName>urn:ietf:carbon:signed:grant-type:saml2-bearer</GrantTypeName>
 		<GrantTypeHandlerImplClass>org.wso2.carbon.device.mgt.oauth.extensions.handlers.grant.ExtendedSAML2BearerGrantHandler</GrantTypeHandlerImplClass>
 		<GrantTypeValidatorImplClass>org.wso2.carbon.identity.oauth.common.SAML2GrantValidator</GrantTypeValidatorImplClass>
 	</SupportedGrantType>]]></value>
diff --git a/modules/core/distribution/src/repository/jaggeryapps/portal/configs/designer.json b/modules/core/distribution/src/repository/jaggeryapps/portal/configs/designer.json
index 8c023521..c6b2a27b 100644
--- a/modules/core/distribution/src/repository/jaggeryapps/portal/configs/designer.json
+++ b/modules/core/distribution/src/repository/jaggeryapps/portal/configs/designer.json
@@ -43,10 +43,11 @@
               "password":"admin",
               "dynamicClientAppRegistrationServiceURL": "https://localhost:9443/dynamic-client-web/register",
               "apiManagerClientAppRegistrationServiceURL": "%https.host%/api-application-registration/register/tenants",
-              "grantType": "password refresh_token urn:ietf:params:oauth:grant-type:saml2-carbon urn:ietf:params:oauth:grant-type:jwt-bearer",
+              "grantType": "password refresh_token urn:ietf:carbon:signed:grant-type:saml2-bearer urn:ietf:params:oauth:grant-type:jwt-bearer",
               "tokenScope": "admin",
               "callbackUrl": "%https.host%/portal",
-              "saasApp":true
+              "saasApp":true,
+              "samlGrantTypeName": "urn:ietf:carbon:signed:grant-type:saml2-bearer"
             },
             "tokenServiceURL": "https://localhost:9443/oauth2/token"
           },
diff --git a/pom.xml b/pom.xml
index 39d612f5..f4b25207 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1529,7 +1529,7 @@
         <carbon.governance.version>4.7.0</carbon.governance.version>
 
         <!-- Carbon Device Management -->
-        <carbon.device.mgt.version>2.0.11-SNAPSHOT</carbon.device.mgt.version>
+        <carbon.device.mgt.version>2.0.12-SNAPSHOT</carbon.device.mgt.version>
         <carbon.device.mgt.version.range>[2.0.0, 3.0.0)</carbon.device.mgt.version.range>
 
         <!-- IOT Device Management -->
@@ -1539,7 +1539,7 @@
         <carbon.device.mgt.plugin.version>3.0.9-SNAPSHOT</carbon.device.mgt.plugin.version>
 
         <!-- API Management -->
-        <carbon.api.mgt.version>6.1.47</carbon.api.mgt.version>
+        <carbon.api.mgt.version>6.1.59</carbon.api.mgt.version>
         <carbon.api.mgt.version.range>(6.0.0,7.0.0]</carbon.api.mgt.version.range>
 
         <!-- Carbon Mediation -->