diff --git a/modules/distribution/src/analytics/plugins/pom.xml b/modules/distribution/src/analytics/plugins/pom.xml
index abab9f39..00fac867 100644
--- a/modules/distribution/src/analytics/plugins/pom.xml
+++ b/modules/distribution/src/analytics/plugins/pom.xml
@@ -66,6 +66,11 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.raspberrypi.analytics.feature:${carbon.device.mgt.plugin.version}
                                 </featureArtifactDef>
+
+                                <!-- Virtual Fire Alarm Device Type Features -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.virtualfirealarm.analytics.feature:${carbon.device.mgt.plugin.version}
+                                </featureArtifactDef>
                             </featureArtifacts>
                         </configuration>
                     </execution>
@@ -94,6 +99,10 @@
                                     <id>org.wso2.carbon.device.mgt.iot.raspberrypi.analytics.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.iot.virtualfirealarm.analytics.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
                             </features>
                         </configuration>
                     </execution>
diff --git a/modules/distribution/src/core/plugins/plugins-deployer.xml b/modules/distribution/src/core/plugins/plugins-deployer.xml
index 5da767ec..a10ec2c3 100644
--- a/modules/distribution/src/core/plugins/plugins-deployer.xml
+++ b/modules/distribution/src/core/plugins/plugins-deployer.xml
@@ -79,6 +79,13 @@
                                     org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.raspberrypi.backend.feature:${carbon.device.mgt.plugin.version}
                                 </featureArtifactDef>
 
+                                <!-- Virtual Fire Alarm Device Type Features -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature:${carbon.device.mgt.plugin.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature:${carbon.device.mgt.plugin.version}
+                                </featureArtifactDef>
                             </featureArtifacts>
                         </configuration>
                     </execution>
@@ -124,6 +131,16 @@
                                     <id>org.wso2.carbon.device.mgt.iot.raspberrypi.backend.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
+
+                                <!-- Virtual Fire Alarm Device Type Features -->
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
                             </features>
                         </configuration>
                     </execution>
@@ -157,6 +174,12 @@
                                     <id>org.wso2.carbon.device.mgt.iot.raspberrypi.ui.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
+
+                                <!-- Virtual Fire Alarm Device Type UI Features -->
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
                             </features>
                         </configuration>
                     </execution>
@@ -190,6 +213,12 @@
                                     <id>org.wso2.carbon.device.mgt.iot.raspberrypi.backend.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
+
+                                <!-- Virtual Fire Alarm Device Type BE Features -->
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
                             </features>
                         </configuration>
                     </execution>