diff --git a/modules/distribution/src/analytics/conf/input-adapter-change.xml b/modules/distribution/src/analytics/conf/input-adapter-change.xml
index f716cd3e..a978a68c 100644
--- a/modules/distribution/src/analytics/conf/input-adapter-change.xml
+++ b/modules/distribution/src/analytics/conf/input-adapter-change.xml
@@ -28,6 +28,8 @@
 	<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="cleanSession">true</property>
 </adapterConfig>]]></value>
 	</add>
 </processor>
\ No newline at end of file
diff --git a/modules/distribution/src/analytics/conf/output-adapter-change.xml b/modules/distribution/src/analytics/conf/output-adapter-change.xml
index 6db841ef..89d97b19 100644
--- a/modules/distribution/src/analytics/conf/output-adapter-change.xml
+++ b/modules/distribution/src/analytics/conf/output-adapter-change.xml
@@ -14,6 +14,8 @@
         <property key="url">tcp://${mqtt.broker.host}:${mqtt.broker.port}</property>
         <property key="username">admin</property>
 		<property key="password">admin</property>
+		<property key="qos">2</property>
+		<property key="clearSession">true</property>
     </adapterConfig>
 
     <adapterConfig type="secured-websocket">
@@ -33,7 +35,6 @@
         <property key="username">admin</property>
         <property key="password">admin</property>
         <!--websocket connection permissions which are validated for grouping (can have multiple permission.)-->
-        <property key="statsPermission">/permission/admin/device-mgt/realtime_analytics</property>
         <!--offset time from expiry time to trigger refresh call (in seconds)-->
         <property key="tokenRefreshTimeOffset">100</property>
     </adapterConfig>]]></value>
diff --git a/modules/distribution/src/core/conf/input-adapter-change.xml b/modules/distribution/src/core/conf/input-adapter-change.xml
index f716cd3e..101db791 100644
--- a/modules/distribution/src/core/conf/input-adapter-change.xml
+++ b/modules/distribution/src/core/conf/input-adapter-change.xml
@@ -15,6 +15,7 @@
 	<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>
+	<property key="contentValidator">iot-http</property>
 </adapterConfig>
 
 <adapterConfig type="oauth-mqtt">
@@ -28,6 +29,8 @@
 	<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="cleanSession">true</property>
 </adapterConfig>]]></value>
 	</add>
 </processor>
\ No newline at end of file
diff --git a/modules/distribution/src/core/conf/output-adapter-change.xml b/modules/distribution/src/core/conf/output-adapter-change.xml
index 6db841ef..66bd32df 100644
--- a/modules/distribution/src/core/conf/output-adapter-change.xml
+++ b/modules/distribution/src/core/conf/output-adapter-change.xml
@@ -14,6 +14,8 @@
         <property key="url">tcp://${mqtt.broker.host}:${mqtt.broker.port}</property>
         <property key="username">admin</property>
 		<property key="password">admin</property>
+		<property key="qos">2</property>
+		<property key="clearSession">true</property>
     </adapterConfig>
 
     <adapterConfig type="secured-websocket">
@@ -32,8 +34,6 @@
         <property key="deviceMgtServerUrl">https://${iot.gateway.host}:${iot.gateway.https.port}</property>
         <property key="username">admin</property>
         <property key="password">admin</property>
-        <!--websocket connection permissions which are validated for grouping (can have multiple permission.)-->
-        <property key="statsPermission">/permission/admin/device-mgt/realtime_analytics</property>
         <!--offset time from expiry time to trigger refresh call (in seconds)-->
         <property key="tokenRefreshTimeOffset">100</property>
     </adapterConfig>]]></value>