diff --git a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/configs/virtual_firealarm.json b/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/configs/virtual_firealarm.json
index fc5becfe82..5fab6136d3 100644
--- a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/configs/virtual_firealarm.json
+++ b/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/configs/virtual_firealarm.json
@@ -2,7 +2,6 @@
   "deviceType": {
     "label": "Virtual Firealarm",
     "category": "virtual",
-    "downloadAgentUri": "manager/device/virtual_firealarm/download",
     "downloadAgentLinkGenUri": "manager/device/virtual_firealarm/generate_link"
   },
   "analyticStreams": [
diff --git a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/type-view.hbs b/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/type-view.hbs
index f20111f212..2c515f4a0e 100644
--- a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/type-view.hbs
+++ b/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/type-view.hbs
@@ -61,9 +61,9 @@
                                 <br/><br/>
                                 <input type="hidden" class="deviceType" name="deviceType"
                                        value="{{@uriParams.deviceType}}"/>
-                                <input type="radio" name="sketchType" value="simple_agent" id="simple_agent" checked>
+                                <input type="radio" name="sketchType" value="virtual_firealarm" id="virtual_firealarm" checked>
                                 <label for="simple_agent">Simple Agent</label> &nbsp;&nbsp;
-                                <input type="radio" name="sketchType" value="advanced_agent" id="advanced_agent">
+                                <input type="radio" name="sketchType" value="virtual_firealarm_advanced" id="virtual_firealarm_advanced">
                                 <label for="advanced_agent">Advanced Agent</label>
                             </div>
                         </div>