diff --git a/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/conf/devicetype-config.xml b/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/conf/devicetype-config.xml
index 89a16261d1..90d1fac06b 100644
--- a/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/conf/devicetype-config.xml
+++ b/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/conf/devicetype-config.xml
@@ -9,9 +9,9 @@
     <IotDeviceTypeConfig type="digital_display">
         <DatasourceName>jdbc/DigitalDisplayDM_DB</DatasourceName>
     </IotDeviceTypeConfig>
-    <IotDeviceTypeConfig type="drone_analyzer">
-        <DatasourceName>jdbc/DroneAnalyzerDM_DB</DatasourceName>
-    </IotDeviceTypeConfig>
+    <!--<IotDeviceTypeConfig type="drone_analyzer">-->
+        <!--<DatasourceName>jdbc/DroneAnalyzerDM_DB</DatasourceName>-->
+    <!--</IotDeviceTypeConfig>-->
     <!--<IotDeviceTypeConfig type="raspberrypi">-->
         <!--<DatasourceName>jdbc/RaspberryPiDM_DB</DatasourceName>-->
     <!--</IotDeviceTypeConfig>-->
diff --git a/pom.xml b/pom.xml
index 2e2468e740..a4cbec451a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,10 +48,10 @@
 
         <!--Device Specific IoT Components-->
         <module>components/device-mgt-iot-androidsense</module>
-        <module>components/device-mgt-iot-arduino</module>
+        <!--<module>components/device-mgt-iot-arduino</module>-->
         <module>components/device-mgt-iot-digitaldisplay</module>
         <module>components/device-mgt-iot-droneanalyzer</module>
-        <module>components/device-mgt-iot-raspberrypi</module>
+        <!--<module>components/device-mgt-iot-raspberrypi</module>-->
         <module>components/device-mgt-iot-virtualfirealarm</module>
 
         <!--Core MDM and IoT Features-->
@@ -64,10 +64,10 @@
 
         <!--Device specific IoT Features-->
         <module>features/device-mgt-iot-androidsense-feature</module>
-        <module>features/device-mgt-iot-arduino-feature</module>
+        <!--<module>features/device-mgt-iot-arduino-feature</module>-->
         <module>features/device-mgt-iot-digitaldisplay-feature</module>
         <module>features/device-mgt-iot-droneanalyzer-feature</module>
-        <module>features/device-mgt-iot-raspberrypi-feature</module>
+        <!--<module>features/device-mgt-iot-raspberrypi-feature</module>-->
         <module>features/device-mgt-iot-virtualfirealarm-feature</module>
     </modules>
 
@@ -433,12 +433,12 @@
                 <artifactId>org.wso2.carbon.device.mgt.iot.raspberrypi.plugin.impl</artifactId>
                 <version>${carbon.iot.device.mgt.version}</version>
             </dependency>
-            <!--<dependency>-->
-                <!--<groupId>org.wso2.carbon.devicemgt-plugins</groupId>-->
-                <!--<artifactId>org.wso2.carbon.device.mgt.iot.raspberrypi.service.impl</artifactId>-->
-                <!--<version>${carbon.iot.device.mgt.version}</version>-->
-                <!--<type>war</type>-->
-            <!--</dependency>-->
+            <dependency>
+                <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
+                <artifactId>org.wso2.carbon.device.mgt.iot.raspberrypi.service.impl</artifactId>
+                <version>${carbon.iot.device.mgt.version}</version>
+                <type>war</type>
+            </dependency>
 
             <!--+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-->
                             <!--VirtualFireAlarm DeviceType Impl, API and Agent-->