diff --git a/modules/core/distribution/identity_config_change.xml b/modules/core/distribution/identity_config_change.xml
index e24a54ef..8e497d20 100644
--- a/modules/core/distribution/identity_config_change.xml
+++ b/modules/core/distribution/identity_config_change.xml
@@ -7,7 +7,7 @@
 	<!-- Add the scope validator config element -->
 	<add>
 		<after>//s:Server/s:OAuth/s:OAuthCallbackHandlers</after>
-		<value><![CDATA[<OAuthScopeValidator class="org.wso2.carbon.device.mgt.oauth.extensions.validators.ExtendedJDBCScopeValidator"/>]]></value>
+		<value><![CDATA[<OAuthScopeValidator class="org.wso2.carbon.device.mgt.oauth.extensions.handlers.ScopeValidationHandler"/>]]></value>
 	</add>
 	<!-- Add the ntlm grant type validator config element -->
 	<add>
diff --git a/modules/core/distribution/src/repository/conf/etc/webapp-publisher-config.xml b/modules/core/distribution/src/repository/conf/etc/webapp-publisher-config.xml
index 0784d2a4..59a239ac 100644
--- a/modules/core/distribution/src/repository/conf/etc/webapp-publisher-config.xml
+++ b/modules/core/distribution/src/repository/conf/etc/webapp-publisher-config.xml
@@ -35,6 +35,6 @@
 	<!--Webapp will be published only when running below profiles-->
 	<Profiles>
 		<Profile>default</Profile>
-		<Profile>devicetype-publisher</Profile>
+		<Profile>device-manager</Profile>
 	</Profiles>
 </WebappPublisherConfigs>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 24b1cae3..1461699d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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.57</carbon.api.mgt.version>
+        <carbon.api.mgt.version>6.1.64</carbon.api.mgt.version>
         <carbon.api.mgt.version.range>(6.0.0,7.0.0]</carbon.api.mgt.version.range>
 
         <!-- Carbon Mediation -->