diff --git a/modules/samples/virtual_firealarm/build.xml b/modules/samples/virtual_firealarm/build.xml
index 2ec49f63..04468cc0 100644
--- a/modules/samples/virtual_firealarm/build.xml
+++ b/modules/samples/virtual_firealarm/build.xml
@@ -23,7 +23,8 @@
                 <![CDATA[
     <IotDeviceTypeConfig type="${sample_type}">
 		<DatasourceName>jdbc/${data_source}</DatasourceName>
-		<ApiApplicationName>virtual_firealarm</ApiApplicationName>
+		<!--TODO: Uncomment this to work with apim @ 192.168.67.21 -->
+		<!--ApiApplicationName>firealarm</ApiApplicationName-->
 	</IotDeviceTypeConfig>
 	            ]]>
             </insert>
@@ -96,6 +97,8 @@
         <delete dir="${target.sketch.dir}/${sample_type}"/>
         <delete file="${target.page.dir}/${sample_type}.hbs"/>
         <delete dir="${target.unit.dir}/${sample_type}"/>
+        <delete file="${target.page.dir}/${sample_type}.hbs"/>
+        <delete dir="${target.unit.dir}/${sample_type}"/>
         <xmltask source="${iot.conf}" dest="${iot.conf}" report="true">
             <remove path="/IoTDeviceTypeConfigManager/IotDeviceTypeConfig[type='${sample_type}']"/>
         </xmltask>
diff --git a/modules/samples/virtual_firealarm/src/org.wso2.carbon.device.mgt.iot.sample.virtual.firealarm.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/virtual/firealarm/service/impl/VirtualFireAlarmManagerService.java b/modules/samples/virtual_firealarm/src/org.wso2.carbon.device.mgt.iot.sample.virtual.firealarm.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/virtual/firealarm/service/impl/VirtualFireAlarmManagerService.java
index c75937cc..48a1a1b5 100644
--- a/modules/samples/virtual_firealarm/src/org.wso2.carbon.device.mgt.iot.sample.virtual.firealarm.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/virtual/firealarm/service/impl/VirtualFireAlarmManagerService.java
+++ b/modules/samples/virtual_firealarm/src/org.wso2.carbon.device.mgt.iot.sample.virtual.firealarm.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/virtual/firealarm/service/impl/VirtualFireAlarmManagerService.java
@@ -292,7 +292,7 @@ public class VirtualFireAlarmManagerService {
 		//create new device id
 		String deviceId = shortUUID();
 
-		TokenClient accessTokenClient = new TokenClient("firealarm");
+		TokenClient accessTokenClient = new TokenClient(VirtualFireAlarmConstants.DEVICE_TYPE);
 		AccessTokenInfo accessTokenInfo = null;
 
 		accessTokenInfo = accessTokenClient.getAccessToken(owner, deviceId);