diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 08dc45ba..0f8ea4d8 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -325,6 +325,11 @@
 											dir="target/wso2carbon-core-${carbon.kernel.version}/samples/raspberrypi"
 											includes="build.xml"/>
 								</subant>
+								<subant target="deploy">
+									<fileset
+											dir="target/wso2carbon-core-${carbon.kernel.version}/samples/virtual_firealarm"
+											includes="build.xml"/>
+								</subant>
 								<copy todir="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/"
 									  overwrite="true">
 									<fileset
diff --git a/modules/samples/virtual_firealarm/build.xml b/modules/samples/virtual_firealarm/build.xml
index 594a20d5..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>
@@ -62,7 +63,19 @@
         </exec>
     </target>
 
-    <target name="deploy" depends="create-db,build">
+    <target name="build-agent">
+        <echo message="Downloading agent source...." />
+        <exec dir="." executable="sh">
+            <arg line="-c 'svn checkout https://github.com/wso2-incubator/iot-server-agents/trunk/FireAlarmVirtualAgent'" />
+        </exec>
+        <echo message="building agent from source" />
+        <exec dir="FireAlarmVirtualAgent" executable="sh">
+            <arg line="-c 'mvn clean install'" />
+        </exec>
+        <copy file="FireAlarmVirtualAgent/target/wso2-firealarm-virtual-agent.jar" todir="sketch"/>
+    </target>
+
+    <target name="deploy" depends="create-db,build-agent,build">
         <copy toDir="${target.sketch.dir}/${sample_type}">
             <fileset dir="sketch"/>
         </copy>
@@ -84,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/sketch/firealarm-virtual-agent-1.0-SNAPSHOT-jar-with-dependencies.jar.zip b/modules/samples/virtual_firealarm/sketch/firealarm-virtual-agent-1.0-SNAPSHOT-jar-with-dependencies.jar.zip
deleted file mode 100644
index ffbf8956..00000000
Binary files a/modules/samples/virtual_firealarm/sketch/firealarm-virtual-agent-1.0-SNAPSHOT-jar-with-dependencies.jar.zip and /dev/null differ
diff --git a/modules/samples/virtual_firealarm/sketch/sketch.properties b/modules/samples/virtual_firealarm/sketch/sketch.properties
index 2a2a2f91..801bd88d 100644
--- a/modules/samples/virtual_firealarm/sketch/sketch.properties
+++ b/modules/samples/virtual_firealarm/sketch/sketch.properties
@@ -1,2 +1,2 @@
 templates=deviceConfig.properties
-zipfilename=FireAlarmAgent.zip
+zipfilename=FireAlarmVirtualAgent.zip
diff --git a/modules/samples/virtual_firealarm/sketch/startservice.sh b/modules/samples/virtual_firealarm/sketch/startservice.sh
index fb20aaf2..2cb211ef 100644
--- a/modules/samples/virtual_firealarm/sketch/startservice.sh
+++ b/modules/samples/virtual_firealarm/sketch/startservice.sh
@@ -34,7 +34,7 @@ while true; do
 done
 
 
-java -jar firealarm-virtual-agent-1.0-SNAPSHOT-jar-with-dependencies.jar
+java -jar wso2-firealarm-virtual-agent.jar
 
 #while true; do
 #    read -p "Do you wish to run 'apt-get update' and continue? [Yes/No] " yn
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 9a58df9a..b3c122b2 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);