diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index c1ec4aeb..cb1fd111 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -581,15 +581,15 @@
 
 
         <!-- Dashboard portal Jaggery app. Should be copied to <DAS_HOME>/repository/deployment/server/jaggeryapps -->
-        <fileSet>
-            <directory>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/portal
-            </directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/portal</outputDirectory>
-            <includes>
-                <include>**/*</include>
-            </includes>
-        </fileSet>
+        <!--<fileSet>-->
+            <!--<directory>-->
+                <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/portal-->
+            <!--</directory>-->
+            <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/portal</outputDirectory>-->
+            <!--<includes>-->
+                <!--<include>**/*</include>-->
+            <!--</includes>-->
+        <!--</fileSet>-->
 
         <!-- END UES related dashboard artifacts -->
 
diff --git a/modules/samples/common.xml b/modules/samples/common.xml
index d47f03f5..a4132680 100644
--- a/modules/samples/common.xml
+++ b/modules/samples/common.xml
@@ -1,6 +1,7 @@
 <project>
     <property name="lib.dir" value="../../repository/components/plugins"/>
-    <property name="iot.conf" value="../../repository/conf/iot/iot-config.xml"/>
+    <property name="iot.conf.dir" value="../../repository/conf/iot"/>
+    <property name="iot.conf" value="${iot.conf.dir}/iot-config.xml"/>
     <property name="datasources.conf" value="../../repository/conf/datasources/master-datasources.xml"/>
     <property name="target.db.dir" value="../../repository/database"/>
     <property name="target.dropins.dir" value="../../repository/components/dropins"/>
diff --git a/modules/samples/virtual_firealarm/build.xml b/modules/samples/virtual_firealarm/build.xml
index ccdf3838..2e23c9ac 100644
--- a/modules/samples/virtual_firealarm/build.xml
+++ b/modules/samples/virtual_firealarm/build.xml
@@ -75,7 +75,20 @@
         <copy file="FireAlarmVirtualAgent/target/wso2-firealarm-virtual-agent.jar" todir="sketch"/>
     </target>
 
-    <target name="deploy" depends="create-db,build-agent,build">
+    <target name="build-api">
+        <echo message="Downloading api source...."/>
+        <exec dir="." executable="sh">
+            <arg line="-c 'svn checkout https://github.com/wso2-incubator/iot-server-appliances/trunk/firealarm-webapp --non-interactive --trust-server-cert'"/>
+        </exec>
+        <echo message="building api from source"/>
+        <exec dir="firealarm-webapp" executable="sh">
+            <arg line="-c 'mvn clean install'"/>
+        </exec>
+        <copy file="firealarm-webapp/target/firealarm-webapp.war" todir="${target.webapp.dir}"/>
+        <copy file="firealarm-webapp/src/main/resources/firealarmApp.properties" todir="${iot.conf.dir}"/>
+    </target>
+
+    <target name="deploy" depends="create-db,build-agent,build-api,build">
         <copy toDir="${target.sketch.dir}/${sample_type}">
             <fileset dir="sketch"/>
         </copy>
@@ -99,6 +112,10 @@
         <delete dir="${target.unit.dir}/${sample_type}"/>
         <delete file="${target.page.dir}/${sample_type}.hbs"/>
         <delete dir="${target.unit.dir}/${sample_type}"/>
+        <delete dir="${target.webapp.dir}/${sample_type}"/>
+        <delete file="${target.webapp.dir}/${sample_type}.war"/>
+        <delete dir="${target.webapp.dir}/firealarm-webapp"/>
+        <delete file="${target.webapp.dir}/firealarm-webapp.war"/>
         <xmltask source="${iot.conf}" dest="${iot.conf}" report="true">
             <remove path="/IoTDeviceTypeConfigManager/IotDeviceTypeConfig[type='${sample_type}']"/>
         </xmltask>