diff --git a/modules/analytics/distribution/input-adapter-change.xml b/modules/analytics/distribution/input-adapter-change.xml
index 854702e0..777004fa 100644
--- a/modules/analytics/distribution/input-adapter-change.xml
+++ b/modules/analytics/distribution/input-adapter-change.xml
@@ -9,9 +9,12 @@
 	<property key="jobQueueSize">10000</property>
 	<property key="maximumHttpConnectionPerHost">2</property>
 	<property key="maximumTotalHttpConnection">100</property>
-	<property key="keymanagerUrl">https://${iot.keymanager.host}:${iot.keymanager.https.port}</property>
+	<property key="tokenUrl">https://${iot.keymanager.host}:${iot.keymanager.https.port}</property>
 	<property key="username">admin</property>
 	<property key="password">admin</property>
+	<property key="tokenUrl">https://${iot.gateway.host}:${iot.gateway.https.port}/token</property>
+	<property key="deviceMgtServerUrl">https://${iot.gateway.host}:${iot.gateway.https.port}</property>
+	<property key="tokenRefreshTimeOffset">100</property>
 </adapterConfig>
 
 <adapterConfig type="oauth-mqtt">
@@ -22,8 +25,9 @@
 	<property key="jobQueueSize">10000</property>
 	<property key="connectionKeepAliveInterval">60</property>
 	<property key="dcrUrl">https://${iot.keymanager.host}:${iot.keymanager.https.port}/client-registration/v0.11/register</property>
-	<property key="tokenUrl">https://${iot.gateway.host}:${iot.gateway.https.port}/token</property>
 	<property key="url">tcp://${mqtt.broker.host}:${mqtt.broker.port}</property>
+	<property key="username">admin</property>
+	<property key="password">admin</property>
 </adapterConfig>]]></value>
 	</add>
 </processor>
\ No newline at end of file
diff --git a/modules/analytics/distribution/output-adapter-change.xml b/modules/analytics/distribution/output-adapter-change.xml
index 9f4a0aa4..e5f571a5 100644
--- a/modules/analytics/distribution/output-adapter-change.xml
+++ b/modules/analytics/distribution/output-adapter-change.xml
@@ -22,7 +22,7 @@
         <property key="jobQueueSize">10000</property>
         <!--Authorizer holds the information of the authorizer that is used authorize a connection.-->
         <property key="authenticator">org.wso2.carbon.device.mgt.output.adapter.websocket.authentication.OAuthAuthenticator</property>
-        <property key="keymanagerUrl">https://${iot.keymanager.host}:${iot.keymanager.https.port}</property>
+        <property key="tokenValidationUrl">https://${iot.keymanager.host}:${iot.keymanager.https.port}</property>
         <property key="maximumHttpConnectionPerHost">2</property>
         <property key="maximumTotalHttpConnection">100</property>
         <property key="authorizer">org.wso2.carbon.device.mgt.output.adapter.websocket.authorization.DeviceAuthorizer</property>
diff --git a/modules/core/distribution/input-adapter-change.xml b/modules/core/distribution/input-adapter-change.xml
index 854702e0..777004fa 100644
--- a/modules/core/distribution/input-adapter-change.xml
+++ b/modules/core/distribution/input-adapter-change.xml
@@ -9,9 +9,12 @@
 	<property key="jobQueueSize">10000</property>
 	<property key="maximumHttpConnectionPerHost">2</property>
 	<property key="maximumTotalHttpConnection">100</property>
-	<property key="keymanagerUrl">https://${iot.keymanager.host}:${iot.keymanager.https.port}</property>
+	<property key="tokenUrl">https://${iot.keymanager.host}:${iot.keymanager.https.port}</property>
 	<property key="username">admin</property>
 	<property key="password">admin</property>
+	<property key="tokenUrl">https://${iot.gateway.host}:${iot.gateway.https.port}/token</property>
+	<property key="deviceMgtServerUrl">https://${iot.gateway.host}:${iot.gateway.https.port}</property>
+	<property key="tokenRefreshTimeOffset">100</property>
 </adapterConfig>
 
 <adapterConfig type="oauth-mqtt">
@@ -22,8 +25,9 @@
 	<property key="jobQueueSize">10000</property>
 	<property key="connectionKeepAliveInterval">60</property>
 	<property key="dcrUrl">https://${iot.keymanager.host}:${iot.keymanager.https.port}/client-registration/v0.11/register</property>
-	<property key="tokenUrl">https://${iot.gateway.host}:${iot.gateway.https.port}/token</property>
 	<property key="url">tcp://${mqtt.broker.host}:${mqtt.broker.port}</property>
+	<property key="username">admin</property>
+	<property key="password">admin</property>
 </adapterConfig>]]></value>
 	</add>
 </processor>
\ No newline at end of file
diff --git a/modules/core/distribution/output-adapter-change.xml b/modules/core/distribution/output-adapter-change.xml
index 9f4a0aa4..e5f571a5 100644
--- a/modules/core/distribution/output-adapter-change.xml
+++ b/modules/core/distribution/output-adapter-change.xml
@@ -22,7 +22,7 @@
         <property key="jobQueueSize">10000</property>
         <!--Authorizer holds the information of the authorizer that is used authorize a connection.-->
         <property key="authenticator">org.wso2.carbon.device.mgt.output.adapter.websocket.authentication.OAuthAuthenticator</property>
-        <property key="keymanagerUrl">https://${iot.keymanager.host}:${iot.keymanager.https.port}</property>
+        <property key="tokenValidationUrl">https://${iot.keymanager.host}:${iot.keymanager.https.port}</property>
         <property key="maximumHttpConnectionPerHost">2</property>
         <property key="maximumTotalHttpConnection">100</property>
         <property key="authorizer">org.wso2.carbon.device.mgt.output.adapter.websocket.authorization.DeviceAuthorizer</property>
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_receiver/connected_cup_receiver.xml b/modules/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_receiver/connected_cup_receiver.xml
index e63f6973..0bf476f5 100644
--- a/modules/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_receiver/connected_cup_receiver.xml
+++ b/modules/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_receiver/connected_cup_receiver.xml
@@ -20,9 +20,7 @@
 <eventReceiver name="connected_cup_receiver" statistics="disable" trace="disable" xmlns="http://wso2.org/carbon/eventreceiver">
     <from eventAdapterType="oauth-mqtt">
         <property name="topic">carbon.super/connectedcup/#</property>
-        <property name="username">admin</property>
-		<property name="password">admin</property>
-        <property name="contentValidator">org.wso2.carbon.device.mgt.input.adapter.mqtt.util.MQTTContentValidator</property>
+        <property name="contentValidator">iot-mqtt</property>
         <property name="contentTransformer">default</property>
         <property name="cleanSession">true</property>
     </from>
diff --git a/pom.xml b/pom.xml
index e36f1e67..a42bb586 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1529,14 +1529,14 @@
         <carbon.governance.version>4.7.0</carbon.governance.version>
 
         <!-- Carbon Device Management -->
-        <carbon.device.mgt.version>2.0.12-SNAPSHOT</carbon.device.mgt.version>
+        <carbon.device.mgt.version>2.0.14-SNAPSHOT</carbon.device.mgt.version>
         <carbon.device.mgt.version.range>[2.0.0, 3.0.0)</carbon.device.mgt.version.range>
 
         <!-- IOT Device Management -->
         <product.iot.version>3.1.0-SNAPSHOT</product.iot.version>
 
         <!-- Carbon Device Management Plugins-->
-        <carbon.device.mgt.plugin.version>3.0.9-SNAPSHOT</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.plugin.version>3.0.11-SNAPSHOT</carbon.device.mgt.plugin.version>
 
         <!-- API Management -->
         <carbon.api.mgt.version>6.1.64</carbon.api.mgt.version>