diff --git a/iot-core/src/assembly/bin.xml b/iot-core/src/assembly/bin.xml
index e270048..2ac6847 100644
--- a/iot-core/src/assembly/bin.xml
+++ b/iot-core/src/assembly/bin.xml
@@ -88,6 +88,10 @@
             <source>src/core/conf/deployment.toml</source>
             <outputDirectory>${entgra-iot-core}/repository/conf/</outputDirectory>
         </file>
+        <file>
+            <source>src/core/keystores/wso2carbon.jks</source>
+            <outputDirectory>${entgra-iot-core}/repository/resources/security/</outputDirectory>
+        </file>
     </files>
 
     <dependencySets>
diff --git a/iot-core/src/core/keystores/wso2carbon.jks b/iot-core/src/core/keystores/wso2carbon.jks
new file mode 100644
index 0000000..357b9db
Binary files /dev/null and b/iot-core/src/core/keystores/wso2carbon.jks differ
diff --git a/wso2am-4.0.0.zip b/wso2am-4.0.0.zip
deleted file mode 100644
index ece7bd0..0000000
Binary files a/wso2am-4.0.0.zip and /dev/null differ