diff --git a/iot-core/src/assembly/bin.xml b/iot-core/src/assembly/bin.xml
index 2ac6847..e2f6ca8 100644
--- a/iot-core/src/assembly/bin.xml
+++ b/iot-core/src/assembly/bin.xml
@@ -88,6 +88,10 @@
             <source>src/core/conf/deployment.toml</source>
             <outputDirectory>${entgra-iot-core}/repository/conf/</outputDirectory>
         </file>
+        <file>
+            <source>src/core/conf/input-event-adapters.xml</source>
+            <outputDirectory>${entgra-iot-core}/repository/conf/</outputDirectory>
+        </file>
         <file>
             <source>src/core/keystores/wso2carbon.jks</source>
             <outputDirectory>${entgra-iot-core}/repository/resources/security/</outputDirectory>
diff --git a/iot-core/src/core/bin/iot-server.bat b/iot-core/src/core/bin/iot-server.bat
index bdcde7d..2bee15e 100755
--- a/iot-core/src/core/bin/iot-server.bat
+++ b/iot-core/src/core/bin/iot-server.bat
@@ -218,6 +218,7 @@ set CMD_LINE_ARGS=%CMD_LINE_ARGS% -Dorg.apache.jasper.runtime.BodyContentImpl.LI
 set CMD_LINE_ARGS=%CMD_LINE_ARGS% -Dorg.terracotta.quartz.skipUpdateCheck=true -Dcarbon.classpath=%CARBON_CLASSPATH% -Dfile.encoding=UTF8 -DworkerNode=false -Dcarbon.new.config.dir.path="%CARBON_HOME%\repository\resources\conf"
 set CMD_LINE_ARGS=%CMD_LINE_ARGS% -Djava.endorsed.dirs=%JAVA_ENDORSED% -Dorg.wso2.ignoreHostnameVerification=true -Dorg.opensaml.httpclient.https.disableHostnameVerification=true -Dhttpclient.hostnameVerifier="DefaultAndLocalhost"
 set CMD_LINE_ARGS=%CMD_LINE_ARGS% -Diot.core.host="localhost" -Diot.core.https.port="9443" -Diot.core.http.port="9763" -Diot.gateway.host="localhost" -Diot.gateway.https.port="8243" -Diot.gateway.http.port="8280" -Diot.gateway.carbon.https.port="9443" -Diot.gateway.carbon.http.port="9763" -Diot.gateway.websocket.ws.port="9099" -Diot.gateway.websocket.wss.port="8099" -Diot.remotesession.server.host="localhost" -Diot.remotesession.server.https.port="9443"
+set CMD_LINE_ARGS=%CMD_LINE_ARGS% -Dmqtt.broker.host="localhost" -Dmqtt.broker.port="1883"
 
 :runJava
 echo JAVA_HOME environment variable is set to %JAVA_HOME%
diff --git a/iot-core/src/core/bin/iot-server.sh b/iot-core/src/core/bin/iot-server.sh
index 681ea7c..238ba73 100755
--- a/iot-core/src/core/bin/iot-server.sh
+++ b/iot-core/src/core/bin/iot-server.sh
@@ -370,6 +370,8 @@ do
     -Diot.remotesession.server.host="localhost" \
     -Diot.apim.host="localhost" \
     -Diot.apim.https.port="9443" \
+    -Dmqtt.broker.host="localhost" \
+    -Dmqtt.broker.port="1883" \
     -Denable-api-scopes-sharing="true" \
     -Dagent-bundle="org.wso2.carbon.emm.mdmagent" \
     -Diot.reporting.event.host="" \
diff --git a/iot-core/src/core/conf/input-event-adapters.xml b/iot-core/src/core/conf/input-event-adapters.xml
new file mode 100644
index 0000000..25052b2
--- /dev/null
+++ b/iot-core/src/core/conf/input-event-adapters.xml
@@ -0,0 +1,56 @@
+<!--
+  ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+<inputEventAdaptersConfig>
+
+    <adapterConfig type="oauth-mqtt">
+        <!-- Thread Pool Related Properties -->
+        <property key="minThread">8</property>
+        <property key="maxThread">100</property>
+        <property key="keepAliveTimeInMillis">20000</property>
+        <property key="jobQueueSize">10000</property>
+        <property key="connectionKeepAliveInterval">60</property>
+        <property key="dcrUrl">https://${iot.keymanager.host}:${iot.keymanager.https.port}/client-registration/v0.17/register</property>
+        <property key="url">tcp://${mqtt.broker.host}:${mqtt.broker.port}</property>
+        <property key="username">admin</property>
+        <property key="password">admin</property>
+        <property key="contentValidator">deviceid-topic-content-validator</property>
+        <property key="cleanSession">true</property>
+    </adapterConfig>
+
+    <adapterConfig type="http">
+        <property key="minThread">8</property>
+        <property key="maxThread">100</property>
+        <property key="keepAliveTimeInMillis">20000</property>
+        <property key="jobQueueSize">10000</property>
+    </adapterConfig>
+
+    <adapterConfig type="file-tail">
+        <property key="events.duplicated.in.cluster">false</property>
+    </adapterConfig>
+
+    <adapterConfig type="email">
+        <property key="moveToFolderName">readMails</property>
+    </adapterConfig>
+
+    <adapterConfig type="jms">
+        <property key="keepAliveTimeInMillis">20000</property>
+        <property key="jobQueueSize">10000</property>
+    </adapterConfig>
+
+</inputEventAdaptersConfig>
\ No newline at end of file
diff --git a/p2-profile/iot/pom.xml b/p2-profile/iot/pom.xml
index 3a74a5b..214de54 100644
--- a/p2-profile/iot/pom.xml
+++ b/p2-profile/iot/pom.xml
@@ -57,6 +57,49 @@
                             </artifactItems>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>copy-emqx-exhook</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
+                                    <artifactId>io.entgra.device.mgt.plugins.emqx.exhook</artifactId>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                    <type>jar</type>
+                                    <overWrite>true</overWrite>
+                                    <classifier>jar-with-dependencies</classifier>
+                                    <outputDirectory>${project.basedir}/target/${entgra-iot-core}/repository/components/lib/</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>true</overWriteSnapshots>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>copy-emqx-initializer</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
+                                    <artifactId>io.entgra.device.mgt.plugins.emqx.initializer</artifactId>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                    <type>jar</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${project.basedir}/target/${entgra-iot-core}/repository/components/dropins/</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>true</overWriteSnapshots>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
             <plugin>
diff --git a/pom.xml b/pom.xml
index 6f4851f..81f9518 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,7 +121,7 @@
         <!--Orbit versions-->
         <orbit.h2.engine.version>1.4.199.wso2v1</orbit.h2.engine.version>
 
-        <carbon.device.mgt.plugin.version>6.0.12-SNAPSHOT</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.plugin.version>6.0.13-SNAPSHOT</carbon.device.mgt.plugin.version>
 
 
     </properties>