diff --git a/modules/distribution/src/analytics/conf/input-adapter-change.xml b/modules/distribution/src/analytics/conf/input-adapter-change.xml
index a978a68c..b1f0161f 100644
--- a/modules/distribution/src/analytics/conf/input-adapter-change.xml
+++ b/modules/distribution/src/analytics/conf/input-adapter-change.xml
@@ -28,7 +28,7 @@
 	<property key="url">tcp://${mqtt.broker.host}:${mqtt.broker.port}</property>
 	<property key="username">admin</property>
 	<property key="password">admin</property>
-	<property key="contentValidator">iot-mqtt</property>
+	<property key="contentValidator">deviceid-topic-content-validator</property>
 	<property key="cleanSession">true</property>
 </adapterConfig>]]></value>
 	</add>
diff --git a/modules/distribution/src/core/conf/input-adapter-change.xml b/modules/distribution/src/core/conf/input-adapter-change.xml
index 101db791..dd1d5be2 100644
--- a/modules/distribution/src/core/conf/input-adapter-change.xml
+++ b/modules/distribution/src/core/conf/input-adapter-change.xml
@@ -29,7 +29,7 @@
 	<property key="url">tcp://${mqtt.broker.host}:${mqtt.broker.port}</property>
 	<property key="username">admin</property>
 	<property key="password">admin</property>
-	<property key="contentValidator">iot-mqtt</property>
+	<property key="contentValidator">deviceid-topic-content-validator</property>
 	<property key="cleanSession">true</property>
 </adapterConfig>]]></value>
 	</add>
diff --git a/modules/distribution/src/core/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_receiver/connected_cup_receiver.xml b/modules/distribution/src/core/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_receiver/connected_cup_receiver.xml
index 0bf476f5..229ae2dd 100644
--- a/modules/distribution/src/core/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_receiver/connected_cup_receiver.xml
+++ b/modules/distribution/src/core/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_receiver/connected_cup_receiver.xml
@@ -20,7 +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="contentValidator">iot-mqtt</property>
+        <property name="contentValidator">deviceid-topic-content-validator</property>
         <property name="contentTransformer">default</property>
         <property name="cleanSession">true</property>
     </from>
diff --git a/pom.xml b/pom.xml
index b9a4a003..e92fc71e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1512,7 +1512,7 @@
 
         <!-- Carbon Device Management -->
 
-        <carbon.device.mgt.version>2.0.69-SNAPSHOT</carbon.device.mgt.version>
+        <carbon.device.mgt.version>2.0.72-SNAPSHOT</carbon.device.mgt.version>
         <carbon.device.mgt.version.range>[2.0.0, 3.0.0)</carbon.device.mgt.version.range>
 
         <!-- IOT Device Management -->
@@ -1520,7 +1520,7 @@
 
         <!-- Carbon Device Management Plugins-->
 
-        <carbon.device.mgt.plugin.version>3.0.37-SNAPSHOT</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.plugin.version>3.0.39-SNAPSHOT</carbon.device.mgt.plugin.version>
 
         <!-- API Management -->
         <carbon.api.mgt.version>6.1.80</carbon.api.mgt.version>