diff --git a/modules/samples/virtual_firealarm/build.xml b/modules/samples/virtual_firealarm/build.xml
index 594a20d5..2ec49f63 100644
--- a/modules/samples/virtual_firealarm/build.xml
+++ b/modules/samples/virtual_firealarm/build.xml
@@ -62,7 +62,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>
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